Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/2.6.32
diff options
context:
space:
mode:
authorAnthony G. Basile <basile@opensource.dyc.edu>2011-01-01 09:27:55 -0500
committerAnthony G. Basile <basile@opensource.dyc.edu>2011-01-01 09:27:55 -0500
commit0b7a732308a501e4e906d2e317d4808d0e75a4ed (patch)
tree32b8feb83a033f9e7dca613a5ccf45c1d5591b7c /2.6.32
parentUpdate Grsec/PaX (diff)
downloadhardened-patchset-0b7a732308a501e4e906d2e317d4808d0e75a4ed.tar.gz
hardened-patchset-0b7a732308a501e4e906d2e317d4808d0e75a4ed.tar.bz2
hardened-patchset-0b7a732308a501e4e906d2e317d4808d0e75a4ed.zip
Update Grsec/PaX
2.2.1-2.6.32.27-201101010201 against 2.6.32.27 2.2.1-2.6.36.2-201101010201 against 2.6.36.2
Diffstat (limited to '2.6.32')
-rw-r--r--2.6.32/0000_README2
-rw-r--r--2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101010201.patch (renamed from 2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201012182005.patch)5301
-rw-r--r--2.6.32/4425_grsec-pax-without-grsec.patch2
-rw-r--r--2.6.32/4445_disable-compat_vdso.patch2
4 files changed, 2600 insertions, 2707 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 7f6cbfc..0d22820 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -3,7 +3,7 @@ README
Individual Patch Descriptions:
-----------------------------------------------------------------------------
-Patch: 4420_grsecurity-2.2.1-2.6.32.27-201012182005.patch
+Patch: 4420_grsecurity-2.2.1-2.6.32.27-201101010201.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201012182005.patch b/2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101010201.patch
index 5f5475b..69ffcab 100644
--- a/2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201012182005.patch
+++ b/2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101010201.patch
@@ -1,6 +1,6 @@
diff -urNp linux-2.6.32.27/arch/alpha/include/asm/elf.h linux-2.6.32.27/arch/alpha/include/asm/elf.h
--- linux-2.6.32.27/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/alpha/include/asm/elf.h 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/alpha/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -17,7 +17,7 @@ diff -urNp linux-2.6.32.27/arch/alpha/include/asm/elf.h linux-2.6.32.27/arch/alp
linker to call DT_FINI functions for shared libraries that have
diff -urNp linux-2.6.32.27/arch/alpha/include/asm/pgtable.h linux-2.6.32.27/arch/alpha/include/asm/pgtable.h
--- linux-2.6.32.27/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/alpha/include/asm/pgtable.h 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/alpha/include/asm/pgtable.h 2010-12-31 14:46:53.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)
@@ -38,7 +38,7 @@ diff -urNp linux-2.6.32.27/arch/alpha/include/asm/pgtable.h linux-2.6.32.27/arch
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
diff -urNp linux-2.6.32.27/arch/alpha/kernel/module.c linux-2.6.32.27/arch/alpha/kernel/module.c
--- linux-2.6.32.27/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/alpha/kernel/module.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/alpha/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -50,7 +50,7 @@ diff -urNp linux-2.6.32.27/arch/alpha/kernel/module.c linux-2.6.32.27/arch/alpha
for (i = 0; i < n; i++) {
diff -urNp linux-2.6.32.27/arch/alpha/kernel/osf_sys.c linux-2.6.32.27/arch/alpha/kernel/osf_sys.c
--- linux-2.6.32.27/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/alpha/kernel/osf_sys.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/alpha/kernel/osf_sys.c 2010-12-31 14:46:53.000000000 -0500
@@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
@@ -84,7 +84,7 @@ diff -urNp linux-2.6.32.27/arch/alpha/kernel/osf_sys.c linux-2.6.32.27/arch/alph
diff -urNp linux-2.6.32.27/arch/alpha/mm/fault.c linux-2.6.32.27/arch/alpha/mm/fault.c
--- linux-2.6.32.27/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/alpha/mm/fault.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/alpha/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -243,7 +243,7 @@ diff -urNp linux-2.6.32.27/arch/alpha/mm/fault.c linux-2.6.32.27/arch/alpha/mm/f
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
diff -urNp linux-2.6.32.27/arch/arm/include/asm/elf.h linux-2.6.32.27/arch/arm/include/asm/elf.h
--- linux-2.6.32.27/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/include/asm/elf.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/arm/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -109,7 +109,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. */
@@ -262,7 +262,7 @@ diff -urNp linux-2.6.32.27/arch/arm/include/asm/elf.h linux-2.6.32.27/arch/arm/i
registered with atexit, as per the SVR4 ABI. A value of 0 means we
diff -urNp linux-2.6.32.27/arch/arm/include/asm/kmap_types.h linux-2.6.32.27/arch/arm/include/asm/kmap_types.h
--- linux-2.6.32.27/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/include/asm/kmap_types.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/arm/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -273,7 +273,7 @@ diff -urNp linux-2.6.32.27/arch/arm/include/asm/kmap_types.h linux-2.6.32.27/arc
diff -urNp linux-2.6.32.27/arch/arm/include/asm/uaccess.h linux-2.6.32.27/arch/arm/include/asm/uaccess.h
--- linux-2.6.32.27/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/include/asm/uaccess.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/arm/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -296,7 +296,7 @@ diff -urNp linux-2.6.32.27/arch/arm/include/asm/uaccess.h linux-2.6.32.27/arch/a
return n;
diff -urNp linux-2.6.32.27/arch/arm/kernel/kgdb.c linux-2.6.32.27/arch/arm/kernel/kgdb.c
--- linux-2.6.32.27/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/kernel/kgdb.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -308,7 +308,7 @@ diff -urNp linux-2.6.32.27/arch/arm/kernel/kgdb.c linux-2.6.32.27/arch/arm/kerne
#else /* ! __ARMEB__ */
diff -urNp linux-2.6.32.27/arch/arm/mach-at91/pm.c linux-2.6.32.27/arch/arm/mach-at91/pm.c
--- linux-2.6.32.27/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mach-at91/pm.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mach-at91/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -348,7 +348,7 @@ static void at91_pm_end(void)
}
@@ -320,7 +320,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mach-at91/pm.c linux-2.6.32.27/arch/arm/mach
.enter = at91_pm_enter,
diff -urNp linux-2.6.32.27/arch/arm/mach-omap1/pm.c linux-2.6.32.27/arch/arm/mach-omap1/pm.c
--- linux-2.6.32.27/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mach-omap1/pm.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mach-omap1/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -332,7 +332,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mach-omap1/pm.c linux-2.6.32.27/arch/arm/mac
.finish = omap_pm_finish,
diff -urNp linux-2.6.32.27/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.27/arch/arm/mach-omap2/pm24xx.c
--- linux-2.6.32.27/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mach-omap2/pm24xx.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mach-omap2/pm24xx.c 2010-12-31 14:46:53.000000000 -0500
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -344,7 +344,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.27/arch/arm
.finish = omap2_pm_finish,
diff -urNp linux-2.6.32.27/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.27/arch/arm/mach-omap2/pm34xx.c
--- linux-2.6.32.27/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mach-omap2/pm34xx.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mach-omap2/pm34xx.c 2010-12-31 14:46:53.000000000 -0500
@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
return;
}
@@ -356,7 +356,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.27/arch/arm
.prepare = omap3_pm_prepare,
diff -urNp linux-2.6.32.27/arch/arm/mach-pnx4008/pm.c linux-2.6.32.27/arch/arm/mach-pnx4008/pm.c
--- linux-2.6.32.27/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mach-pnx4008/pm.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mach-pnx4008/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -368,7 +368,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mach-pnx4008/pm.c linux-2.6.32.27/arch/arm/m
};
diff -urNp linux-2.6.32.27/arch/arm/mach-pxa/pm.c linux-2.6.32.27/arch/arm/mach-pxa/pm.c
--- linux-2.6.32.27/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mach-pxa/pm.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mach-pxa/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -380,7 +380,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mach-pxa/pm.c linux-2.6.32.27/arch/arm/mach-
.prepare = pxa_pm_prepare,
diff -urNp linux-2.6.32.27/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.27/arch/arm/mach-pxa/sharpsl_pm.c
--- linux-2.6.32.27/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -392,7 +392,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.27/arch/a
.enter = corgi_pxa_pm_enter,
diff -urNp linux-2.6.32.27/arch/arm/mach-sa1100/pm.c linux-2.6.32.27/arch/arm/mach-sa1100/pm.c
--- linux-2.6.32.27/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mach-sa1100/pm.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mach-sa1100/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -404,7 +404,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mach-sa1100/pm.c linux-2.6.32.27/arch/arm/ma
};
diff -urNp linux-2.6.32.27/arch/arm/mm/fault.c linux-2.6.32.27/arch/arm/mm/fault.c
--- linux-2.6.32.27/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mm/fault.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -455,7 +455,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mm/fault.c linux-2.6.32.27/arch/arm/mm/fault
*
diff -urNp linux-2.6.32.27/arch/arm/mm/mmap.c linux-2.6.32.27/arch/arm/mm/mmap.c
--- linux-2.6.32.27/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/mm/mmap.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -507,7 +507,7 @@ diff -urNp linux-2.6.32.27/arch/arm/mm/mmap.c linux-2.6.32.27/arch/arm/mm/mmap.c
*/
diff -urNp linux-2.6.32.27/arch/arm/plat-s3c/pm.c linux-2.6.32.27/arch/arm/plat-s3c/pm.c
--- linux-2.6.32.27/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/arm/plat-s3c/pm.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/arm/plat-s3c/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -519,7 +519,7 @@ diff -urNp linux-2.6.32.27/arch/arm/plat-s3c/pm.c linux-2.6.32.27/arch/arm/plat-
.finish = s3c_pm_finish,
diff -urNp linux-2.6.32.27/arch/avr32/include/asm/elf.h linux-2.6.32.27/arch/avr32/include/asm/elf.h
--- linux-2.6.32.27/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/avr32/include/asm/elf.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/avr32/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -85,8 +85,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. */
@@ -538,7 +538,7 @@ diff -urNp linux-2.6.32.27/arch/avr32/include/asm/elf.h linux-2.6.32.27/arch/avr
instruction set this CPU supports. This could be done in user space,
diff -urNp linux-2.6.32.27/arch/avr32/include/asm/kmap_types.h linux-2.6.32.27/arch/avr32/include/asm/kmap_types.h
--- linux-2.6.32.27/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/avr32/include/asm/kmap_types.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/avr32/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -551,7 +551,7 @@ diff -urNp linux-2.6.32.27/arch/avr32/include/asm/kmap_types.h linux-2.6.32.27/a
#undef D
diff -urNp linux-2.6.32.27/arch/avr32/mach-at32ap/pm.c linux-2.6.32.27/arch/avr32/mach-at32ap/pm.c
--- linux-2.6.32.27/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/avr32/mach-at32ap/pm.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/avr32/mach-at32ap/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -563,7 +563,7 @@ diff -urNp linux-2.6.32.27/arch/avr32/mach-at32ap/pm.c linux-2.6.32.27/arch/avr3
};
diff -urNp linux-2.6.32.27/arch/avr32/mm/fault.c linux-2.6.32.27/arch/avr32/mm/fault.c
--- linux-2.6.32.27/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/avr32/mm/fault.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/avr32/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -607,7 +607,7 @@ diff -urNp linux-2.6.32.27/arch/avr32/mm/fault.c linux-2.6.32.27/arch/avr32/mm/f
"sp %08lx ecr %lu\n",
diff -urNp linux-2.6.32.27/arch/blackfin/kernel/kgdb.c linux-2.6.32.27/arch/blackfin/kernel/kgdb.c
--- linux-2.6.32.27/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/blackfin/kernel/kgdb.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/blackfin/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
@@ -619,7 +619,7 @@ diff -urNp linux-2.6.32.27/arch/blackfin/kernel/kgdb.c linux-2.6.32.27/arch/blac
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
diff -urNp linux-2.6.32.27/arch/blackfin/mach-common/pm.c linux-2.6.32.27/arch/blackfin/mach-common/pm.c
--- linux-2.6.32.27/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/blackfin/mach-common/pm.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/blackfin/mach-common/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -631,7 +631,7 @@ diff -urNp linux-2.6.32.27/arch/blackfin/mach-common/pm.c linux-2.6.32.27/arch/b
};
diff -urNp linux-2.6.32.27/arch/frv/include/asm/kmap_types.h linux-2.6.32.27/arch/frv/include/asm/kmap_types.h
--- linux-2.6.32.27/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/frv/include/asm/kmap_types.h 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/frv/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -642,7 +642,7 @@ diff -urNp linux-2.6.32.27/arch/frv/include/asm/kmap_types.h linux-2.6.32.27/arc
diff -urNp linux-2.6.32.27/arch/frv/mm/elf-fdpic.c linux-2.6.32.27/arch/frv/mm/elf-fdpic.c
--- linux-2.6.32.27/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/frv/mm/elf-fdpic.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/frv/mm/elf-fdpic.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
if (addr) {
addr = PAGE_ALIGN(addr);
@@ -673,7 +673,7 @@ diff -urNp linux-2.6.32.27/arch/frv/mm/elf-fdpic.c linux-2.6.32.27/arch/frv/mm/e
}
diff -urNp linux-2.6.32.27/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.27/arch/ia64/hp/common/hwsw_iommu.c
--- linux-2.6.32.27/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/hp/common/hwsw_iommu.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/hp/common/hwsw_iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -694,7 +694,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.27/arch
return &swiotlb_dma_ops;
diff -urNp linux-2.6.32.27/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.27/arch/ia64/hp/common/sba_iommu.c
--- linux-2.6.32.27/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/hp/common/sba_iommu.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/hp/common/sba_iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -715,7 +715,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.27/arch/
.map_page = sba_map_page,
diff -urNp linux-2.6.32.27/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.27/arch/ia64/ia32/binfmt_elf32.c
--- linux-2.6.32.27/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/ia32/binfmt_elf32.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/ia32/binfmt_elf32.c 2010-12-31 14:46:53.000000000 -0500
@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
#define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
@@ -732,7 +732,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.27/arch/ia
diff -urNp linux-2.6.32.27/arch/ia64/ia32/ia32priv.h linux-2.6.32.27/arch/ia64/ia32/ia32priv.h
--- linux-2.6.32.27/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/ia32/ia32priv.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/ia32/ia32priv.h 2010-12-31 14:46:53.000000000 -0500
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -751,7 +751,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/ia32/ia32priv.h linux-2.6.32.27/arch/ia64/i
diff -urNp linux-2.6.32.27/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.27/arch/ia64/include/asm/dma-mapping.h
--- linux-2.6.32.27/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/include/asm/dma-mapping.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -797,7 +797,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.27/a
diff -urNp linux-2.6.32.27/arch/ia64/include/asm/elf.h linux-2.6.32.27/arch/ia64/include/asm/elf.h
--- linux-2.6.32.27/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/include/asm/elf.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -43,6 +43,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -814,7 +814,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/include/asm/elf.h linux-2.6.32.27/arch/ia64
/* IA-64 relocations: */
diff -urNp linux-2.6.32.27/arch/ia64/include/asm/machvec.h linux-2.6.32.27/arch/ia64/include/asm/machvec.h
--- linux-2.6.32.27/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/include/asm/machvec.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/include/asm/machvec.h 2010-12-31 14:46:53.000000000 -0500
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -835,7 +835,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/include/asm/machvec.h linux-2.6.32.27/arch/
* Define default versions so we can extend machvec for new platforms without having
diff -urNp linux-2.6.32.27/arch/ia64/include/asm/pgtable.h linux-2.6.32.27/arch/ia64/include/asm/pgtable.h
--- linux-2.6.32.27/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/include/asm/pgtable.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -865,7 +865,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/include/asm/pgtable.h linux-2.6.32.27/arch/
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
diff -urNp linux-2.6.32.27/arch/ia64/include/asm/uaccess.h linux-2.6.32.27/arch/ia64/include/asm/uaccess.h
--- linux-2.6.32.27/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/include/asm/uaccess.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -886,7 +886,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/include/asm/uaccess.h linux-2.6.32.27/arch/
})
diff -urNp linux-2.6.32.27/arch/ia64/kernel/dma-mapping.c linux-2.6.32.27/arch/ia64/kernel/dma-mapping.c
--- linux-2.6.32.27/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/kernel/dma-mapping.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/kernel/dma-mapping.c 2010-12-31 14:46:53.000000000 -0500
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -907,7 +907,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/kernel/dma-mapping.c linux-2.6.32.27/arch/i
}
diff -urNp linux-2.6.32.27/arch/ia64/kernel/module.c linux-2.6.32.27/arch/ia64/kernel/module.c
--- linux-2.6.32.27/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/kernel/module.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -998,7 +998,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/kernel/module.c linux-2.6.32.27/arch/ia64/k
}
diff -urNp linux-2.6.32.27/arch/ia64/kernel/pci-dma.c linux-2.6.32.27/arch/ia64/kernel/pci-dma.c
--- linux-2.6.32.27/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/kernel/pci-dma.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -1052,7 +1052,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/kernel/pci-dma.c linux-2.6.32.27/arch/ia64/
* The order of these functions is important for
diff -urNp linux-2.6.32.27/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.27/arch/ia64/kernel/pci-swiotlb.c
--- linux-2.6.32.27/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/kernel/pci-swiotlb.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -1064,7 +1064,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.27/arch/i
.map_page = swiotlb_map_page,
diff -urNp linux-2.6.32.27/arch/ia64/kernel/sys_ia64.c linux-2.6.32.27/arch/ia64/kernel/sys_ia64.c
--- linux-2.6.32.27/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/kernel/sys_ia64.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/kernel/sys_ia64.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -1099,7 +1099,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/kernel/sys_ia64.c linux-2.6.32.27/arch/ia64
return addr;
diff -urNp linux-2.6.32.27/arch/ia64/kernel/topology.c linux-2.6.32.27/arch/ia64/kernel/topology.c
--- linux-2.6.32.27/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/kernel/topology.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/kernel/topology.c 2010-12-31 14:46:53.000000000 -0500
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
return ret;
}
@@ -1111,7 +1111,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/kernel/topology.c linux-2.6.32.27/arch/ia64
diff -urNp linux-2.6.32.27/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.27/arch/ia64/kernel/vmlinux.lds.S
--- linux-2.6.32.27/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/kernel/vmlinux.lds.S 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/kernel/vmlinux.lds.S 2010-12-31 14:46:53.000000000 -0500
@@ -190,7 +190,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1123,7 +1123,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.27/arch/i
*/
diff -urNp linux-2.6.32.27/arch/ia64/mm/fault.c linux-2.6.32.27/arch/ia64/mm/fault.c
--- linux-2.6.32.27/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/mm/fault.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1175,7 +1175,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/mm/fault.c linux-2.6.32.27/arch/ia64/mm/fau
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-2.6.32.27/arch/ia64/mm/hugetlbpage.c linux-2.6.32.27/arch/ia64/mm/hugetlbpage.c
--- linux-2.6.32.27/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/mm/hugetlbpage.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
/* At this point: (!vmm || addr < vmm->vm_end). */
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1187,7 +1187,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/mm/hugetlbpage.c linux-2.6.32.27/arch/ia64/
}
diff -urNp linux-2.6.32.27/arch/ia64/mm/init.c linux-2.6.32.27/arch/ia64/mm/init.c
--- linux-2.6.32.27/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/mm/init.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/mm/init.c 2010-12-31 14:46:53.000000000 -0500
@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1210,7 +1210,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/mm/init.c linux-2.6.32.27/arch/ia64/mm/init
if (insert_vm_struct(current->mm, vma)) {
diff -urNp linux-2.6.32.27/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.27/arch/ia64/sn/pci/pci_dma.c
--- linux-2.6.32.27/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/ia64/sn/pci/pci_dma.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/ia64/sn/pci/pci_dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1222,7 +1222,7 @@ diff -urNp linux-2.6.32.27/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.27/arch/ia64/
.map_page = sn_dma_map_page,
diff -urNp linux-2.6.32.27/arch/m32r/lib/usercopy.c linux-2.6.32.27/arch/m32r/lib/usercopy.c
--- linux-2.6.32.27/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/m32r/lib/usercopy.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/m32r/lib/usercopy.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1245,7 +1245,7 @@ diff -urNp linux-2.6.32.27/arch/m32r/lib/usercopy.c linux-2.6.32.27/arch/m32r/li
__copy_user_zeroing(to,from,n);
diff -urNp linux-2.6.32.27/arch/mips/alchemy/devboards/pm.c linux-2.6.32.27/arch/mips/alchemy/devboards/pm.c
--- linux-2.6.32.27/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/alchemy/devboards/pm.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/mips/alchemy/devboards/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
}
@@ -1257,7 +1257,7 @@ diff -urNp linux-2.6.32.27/arch/mips/alchemy/devboards/pm.c linux-2.6.32.27/arch
.enter = db1x_pm_enter,
diff -urNp linux-2.6.32.27/arch/mips/include/asm/elf.h linux-2.6.32.27/arch/mips/include/asm/elf.h
--- linux-2.6.32.27/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/include/asm/elf.h 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/mips/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1272,7 +1272,7 @@ diff -urNp linux-2.6.32.27/arch/mips/include/asm/elf.h linux-2.6.32.27/arch/mips
#endif /* _ASM_ELF_H */
diff -urNp linux-2.6.32.27/arch/mips/include/asm/page.h linux-2.6.32.27/arch/mips/include/asm/page.h
--- linux-2.6.32.27/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/include/asm/page.h 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/mips/include/asm/page.h 2010-12-31 14:46:53.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;
@@ -1284,7 +1284,7 @@ diff -urNp linux-2.6.32.27/arch/mips/include/asm/page.h linux-2.6.32.27/arch/mip
#define pte_val(x) ((x).pte)
diff -urNp linux-2.6.32.27/arch/mips/include/asm/system.h linux-2.6.32.27/arch/mips/include/asm/system.h
--- linux-2.6.32.27/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/include/asm/system.h 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/mips/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,6 +23,7 @@
#include <asm/dsp.h>
#include <asm/watch.h>
@@ -1303,7 +1303,7 @@ diff -urNp linux-2.6.32.27/arch/mips/include/asm/system.h linux-2.6.32.27/arch/m
#endif /* _ASM_SYSTEM_H */
diff -urNp linux-2.6.32.27/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.27/arch/mips/kernel/binfmt_elfn32.c
--- linux-2.6.32.27/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/kernel/binfmt_elfn32.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/mips/kernel/binfmt_elfn32.c 2010-12-31 14:46:53.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)
@@ -1320,7 +1320,7 @@ diff -urNp linux-2.6.32.27/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.27/arch
#include <linux/elfcore.h>
diff -urNp linux-2.6.32.27/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.27/arch/mips/kernel/binfmt_elfo32.c
--- linux-2.6.32.27/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/kernel/binfmt_elfo32.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/mips/kernel/binfmt_elfo32.c 2010-12-31 14:46:53.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)
@@ -1337,7 +1337,7 @@ diff -urNp linux-2.6.32.27/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.27/arch
/*
diff -urNp linux-2.6.32.27/arch/mips/kernel/kgdb.c linux-2.6.32.27/arch/mips/kernel/kgdb.c
--- linux-2.6.32.27/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/kernel/kgdb.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/mips/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1348,7 +1348,7 @@ diff -urNp linux-2.6.32.27/arch/mips/kernel/kgdb.c linux-2.6.32.27/arch/mips/ker
/*
diff -urNp linux-2.6.32.27/arch/mips/kernel/process.c linux-2.6.32.27/arch/mips/kernel/process.c
--- linux-2.6.32.27/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/kernel/process.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/mips/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1367,7 +1367,7 @@ diff -urNp linux-2.6.32.27/arch/mips/kernel/process.c linux-2.6.32.27/arch/mips/
-}
diff -urNp linux-2.6.32.27/arch/mips/kernel/syscall.c linux-2.6.32.27/arch/mips/kernel/syscall.c
--- linux-2.6.32.27/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/kernel/syscall.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/mips/kernel/syscall.c 2010-12-31 14:46:53.000000000 -0500
@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1404,7 +1404,7 @@ diff -urNp linux-2.6.32.27/arch/mips/kernel/syscall.c linux-2.6.32.27/arch/mips/
if (do_color_align)
diff -urNp linux-2.6.32.27/arch/mips/mm/fault.c linux-2.6.32.27/arch/mips/mm/fault.c
--- linux-2.6.32.27/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/mips/mm/fault.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/mips/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -1431,7 +1431,7 @@ diff -urNp linux-2.6.32.27/arch/mips/mm/fault.c linux-2.6.32.27/arch/mips/mm/fau
* and the problem, and then passes it off to one of the appropriate
diff -urNp linux-2.6.32.27/arch/parisc/include/asm/elf.h linux-2.6.32.27/arch/parisc/include/asm/elf.h
--- linux-2.6.32.27/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/parisc/include/asm/elf.h 2010-12-09 18:12:59.000000000 -0500
++++ linux-2.6.32.27/arch/parisc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1448,7 +1448,7 @@ diff -urNp linux-2.6.32.27/arch/parisc/include/asm/elf.h linux-2.6.32.27/arch/pa
but it's not easy, and we've already done it here. */
diff -urNp linux-2.6.32.27/arch/parisc/include/asm/pgtable.h linux-2.6.32.27/arch/parisc/include/asm/pgtable.h
--- linux-2.6.32.27/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/parisc/include/asm/pgtable.h 2010-12-09 18:12:59.000000000 -0500
++++ linux-2.6.32.27/arch/parisc/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -207,6 +207,17 @@
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1469,7 +1469,7 @@ diff -urNp linux-2.6.32.27/arch/parisc/include/asm/pgtable.h linux-2.6.32.27/arc
#define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
diff -urNp linux-2.6.32.27/arch/parisc/kernel/module.c linux-2.6.32.27/arch/parisc/kernel/module.c
--- linux-2.6.32.27/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/parisc/kernel/module.c 2010-12-09 18:13:00.000000000 -0500
++++ linux-2.6.32.27/arch/parisc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -95,16 +95,38 @@
/* three functions to determine where in the module core
@@ -1572,7 +1572,7 @@ diff -urNp linux-2.6.32.27/arch/parisc/kernel/module.c linux-2.6.32.27/arch/pari
me->arch.unwind_section, table, end, gp);
diff -urNp linux-2.6.32.27/arch/parisc/kernel/sys_parisc.c linux-2.6.32.27/arch/parisc/kernel/sys_parisc.c
--- linux-2.6.32.27/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/parisc/kernel/sys_parisc.c 2010-12-09 18:13:00.000000000 -0500
++++ linux-2.6.32.27/arch/parisc/kernel/sys_parisc.c 2010-12-31 14:46:53.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)
@@ -1602,7 +1602,7 @@ diff -urNp linux-2.6.32.27/arch/parisc/kernel/sys_parisc.c linux-2.6.32.27/arch/
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
diff -urNp linux-2.6.32.27/arch/parisc/kernel/traps.c linux-2.6.32.27/arch/parisc/kernel/traps.c
--- linux-2.6.32.27/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/parisc/kernel/traps.c 2010-12-09 18:13:00.000000000 -0500
++++ linux-2.6.32.27/arch/parisc/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1616,7 +1616,7 @@ diff -urNp linux-2.6.32.27/arch/parisc/kernel/traps.c linux-2.6.32.27/arch/paris
diff -urNp linux-2.6.32.27/arch/parisc/mm/fault.c linux-2.6.32.27/arch/parisc/mm/fault.c
--- linux-2.6.32.27/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/parisc/mm/fault.c 2010-12-09 18:13:00.000000000 -0500
++++ linux-2.6.32.27/arch/parisc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1788,7 +1788,7 @@ diff -urNp linux-2.6.32.27/arch/parisc/mm/fault.c linux-2.6.32.27/arch/parisc/mm
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/device.h linux-2.6.32.27/arch/powerpc/include/asm/device.h
--- linux-2.6.32.27/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/device.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,7 +14,7 @@ struct dev_archdata {
struct device_node *of_node;
@@ -1800,7 +1800,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/device.h linux-2.6.32.27/arc
* When an iommu is in use, dma_data is used as a ptr to the base of the
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.27/arch/powerpc/include/asm/dma-mapping.h
--- linux-2.6.32.27/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/dma-mapping.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
#ifdef CONFIG_PPC64
extern struct dma_map_ops dma_iommu_ops;
@@ -1869,7 +1869,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.2
return dma_ops->mapping_error(dev, dma_addr);
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/elf.h linux-2.6.32.27/arch/powerpc/include/asm/elf.h
--- linux-2.6.32.27/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/elf.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -179,8 +179,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. */
@@ -1904,7 +1904,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/elf.h linux-2.6.32.27/arch/p
/*
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/iommu.h linux-2.6.32.27/arch/powerpc/include/asm/iommu.h
--- linux-2.6.32.27/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/iommu.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
extern void iommu_init_early_dart(void);
extern void iommu_init_early_pasemi(void);
@@ -1917,7 +1917,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/iommu.h linux-2.6.32.27/arch
extern void pci_direct_iommu_init(void);
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.27/arch/powerpc/include/asm/kmap_types.h
--- linux-2.6.32.27/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/kmap_types.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -26,6 +26,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
@@ -1928,7 +1928,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.27
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/page_64.h linux-2.6.32.27/arch/powerpc/include/asm/page_64.h
--- linux-2.6.32.27/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/page_64.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/page_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -180,15 +180,18 @@ do { \
* stack by default, so in the absense of a PT_GNU_STACK program header
* we turn execute permission off.
@@ -1952,7 +1952,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/page_64.h linux-2.6.32.27/ar
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/page.h linux-2.6.32.27/arch/powerpc/include/asm/page.h
--- linux-2.6.32.27/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/page.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
@@ -1977,7 +1977,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/page.h linux-2.6.32.27/arch/
#undef STRICT_MM_TYPECHECKS
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/pci.h linux-2.6.32.27/arch/powerpc/include/asm/pci.h
--- linux-2.6.32.27/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/pci.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/pci.h 2010-12-31 14:46:53.000000000 -0500
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -1991,7 +1991,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/pci.h linux-2.6.32.27/arch/p
#define get_pci_dma_ops() NULL
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.27/arch/powerpc/include/asm/pte-hash32.h
--- linux-2.6.32.27/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/pte-hash32.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/pte-hash32.h 2010-12-31 14:46:53.000000000 -0500
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -2002,7 +2002,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.27
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/reg.h linux-2.6.32.27/arch/powerpc/include/asm/reg.h
--- linux-2.6.32.27/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/reg.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/reg.h 2010-12-31 14:46:53.000000000 -0500
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -2013,7 +2013,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/reg.h linux-2.6.32.27/arch/p
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.27/arch/powerpc/include/asm/swiotlb.h
--- linux-2.6.32.27/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/swiotlb.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/swiotlb.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -2025,7 +2025,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.27/ar
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/system.h linux-2.6.32.27/arch/powerpc/include/asm/system.h
--- linux-2.6.32.27/arch/powerpc/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/system.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
#endif
@@ -2037,7 +2037,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/system.h linux-2.6.32.27/arc
extern unsigned long reloc_offset(void);
diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/uaccess.h linux-2.6.32.27/arch/powerpc/include/asm/uaccess.h
--- linux-2.6.32.27/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/include/asm/uaccess.h 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -2217,7 +2217,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/include/asm/uaccess.h linux-2.6.32.27/ar
static inline unsigned long clear_user(void __user *addr, unsigned long size)
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.27/arch/powerpc/kernel/cacheinfo.c
--- linux-2.6.32.27/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/cacheinfo.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
&cache_assoc_attr,
};
@@ -2229,7 +2229,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.27/arch/
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/dma.c linux-2.6.32.27/arch/powerpc/kernel/dma.c
--- linux-2.6.32.27/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/dma.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
}
#endif
@@ -2241,7 +2241,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/dma.c linux-2.6.32.27/arch/powerp
.map_sg = dma_direct_map_sg,
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.27/arch/powerpc/kernel/dma-iommu.c
--- linux-2.6.32.27/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/dma-iommu.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/dma-iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2253,7 +2253,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.27/arch/
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.27/arch/powerpc/kernel/dma-swiotlb.c
--- linux-2.6.32.27/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/dma-swiotlb.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/dma-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
* map_page, and unmap_page on highmem, use normal dma_ops
* for everything else.
@@ -2265,7 +2265,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.27/arc
.map_sg = swiotlb_map_sg_attrs,
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.27/arch/powerpc/kernel/exceptions-64e.S
--- linux-2.6.32.27/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/exceptions-64e.S 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/exceptions-64e.S 2010-12-31 14:46:53.000000000 -0500
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2286,7 +2286,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.27/
bl .bad_page_fault
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.27/arch/powerpc/kernel/exceptions-64s.S
--- linux-2.6.32.27/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/exceptions-64s.S 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/exceptions-64s.S 2010-12-31 14:46:53.000000000 -0500
@@ -818,10 +818,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2301,7 +2301,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.27/
lwz r4,_DAR(r1)
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/ibmebus.c linux-2.6.32.27/arch/powerpc/kernel/ibmebus.c
--- linux-2.6.32.27/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/ibmebus.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/ibmebus.c 2010-12-31 14:46:53.000000000 -0500
@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2313,7 +2313,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/ibmebus.c linux-2.6.32.27/arch/po
.map_sg = ibmebus_map_sg,
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/kgdb.c linux-2.6.32.27/arch/powerpc/kernel/kgdb.c
--- linux-2.6.32.27/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/kgdb.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
return 0;
@@ -2334,7 +2334,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/kgdb.c linux-2.6.32.27/arch/power
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/module_32.c linux-2.6.32.27/arch/powerpc/kernel/module_32.c
--- linux-2.6.32.27/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/module_32.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/module_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2366,7 +2366,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/module_32.c linux-2.6.32.27/arch/
while (entry->jump[0]) {
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/module.c linux-2.6.32.27/arch/powerpc/kernel/module.c
--- linux-2.6.32.27/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/module.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2408,7 +2408,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/module.c linux-2.6.32.27/arch/pow
const char *name)
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/pci-common.c linux-2.6.32.27/arch/powerpc/kernel/pci-common.c
--- linux-2.6.32.27/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/pci-common.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/pci-common.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2429,7 +2429,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/pci-common.c linux-2.6.32.27/arch
}
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/process.c linux-2.6.32.27/arch/powerpc/kernel/process.c
--- linux-2.6.32.27/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/process.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -539,8 +539,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
@@ -2524,7 +2524,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/process.c linux-2.6.32.27/arch/po
-}
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/signal_32.c linux-2.6.32.27/arch/powerpc/kernel/signal_32.c
--- linux-2.6.32.27/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/signal_32.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/signal_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2536,7 +2536,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/signal_32.c linux-2.6.32.27/arch/
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/signal_64.c linux-2.6.32.27/arch/powerpc/kernel/signal_64.c
--- linux-2.6.32.27/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/signal_64.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/signal_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2548,7 +2548,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/signal_64.c linux-2.6.32.27/arch/
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.27/arch/powerpc/kernel/sys_ppc32.c
--- linux-2.6.32.27/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/sys_ppc32.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/sys_ppc32.c 2010-12-31 14:46:53.000000000 -0500
@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
if (oldlenp) {
if (!error) {
@@ -2564,7 +2564,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.27/arch/
}
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/vdso.c linux-2.6.32.27/arch/powerpc/kernel/vdso.c
--- linux-2.6.32.27/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/vdso.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/vdso.c 2010-12-31 14:46:53.000000000 -0500
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2593,7 +2593,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/vdso.c linux-2.6.32.27/arch/power
goto fail_mmapsem;
diff -urNp linux-2.6.32.27/arch/powerpc/kernel/vio.c linux-2.6.32.27/arch/powerpc/kernel/vio.c
--- linux-2.6.32.27/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/kernel/vio.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/kernel/vio.c 2010-12-31 14:46:53.000000000 -0500
@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
@@ -2618,7 +2618,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/kernel/vio.c linux-2.6.32.27/arch/powerp
diff -urNp linux-2.6.32.27/arch/powerpc/lib/usercopy_64.c linux-2.6.32.27/arch/powerpc/lib/usercopy_64.c
--- linux-2.6.32.27/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/lib/usercopy_64.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2652,7 +2652,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/lib/usercopy_64.c linux-2.6.32.27/arch/p
diff -urNp linux-2.6.32.27/arch/powerpc/mm/fault.c linux-2.6.32.27/arch/powerpc/mm/fault.c
--- linux-2.6.32.27/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/mm/fault.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -2759,7 +2759,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/mm/fault.c linux-2.6.32.27/arch/powerpc/
}
diff -urNp linux-2.6.32.27/arch/powerpc/mm/mmap_64.c linux-2.6.32.27/arch/powerpc/mm/mmap_64.c
--- linux-2.6.32.27/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/mm/mmap_64.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/mm/mmap_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2785,7 +2785,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/mm/mmap_64.c linux-2.6.32.27/arch/powerp
}
diff -urNp linux-2.6.32.27/arch/powerpc/mm/slice.c linux-2.6.32.27/arch/powerpc/mm/slice.c
--- linux-2.6.32.27/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/mm/slice.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/mm/slice.c 2010-12-31 14:46:53.000000000 -0500
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
@@ -2827,7 +2827,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/mm/slice.c linux-2.6.32.27/arch/powerpc/
addr = _ALIGN_UP(addr, 1ul << pshift);
diff -urNp linux-2.6.32.27/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.27/arch/powerpc/platforms/52xx/lite5200_pm.c
--- linux-2.6.32.27/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-12-09 18:12:58.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
@@ -2839,7 +2839,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
.prepare = lite5200_pm_prepare,
diff -urNp linux-2.6.32.27/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.27/arch/powerpc/platforms/52xx/mpc52xx_pm.c
--- linux-2.6.32.27/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-12-09 18:12:58.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
@@ -2851,7 +2851,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
.enter = mpc52xx_pm_enter,
diff -urNp linux-2.6.32.27/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.27/arch/powerpc/platforms/83xx/suspend.c
--- linux-2.6.32.27/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/platforms/83xx/suspend.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/platforms/83xx/suspend.c 2010-12-31 14:46:53.000000000 -0500
@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
@@ -2863,7 +2863,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.27
.enter = mpc83xx_suspend_enter,
diff -urNp linux-2.6.32.27/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.27/arch/powerpc/platforms/cell/iommu.c
--- linux-2.6.32.27/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/platforms/cell/iommu.c 2010-12-09 18:12:57.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/platforms/cell/iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2875,7 +2875,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.27/a
.map_sg = dma_fixed_map_sg,
diff -urNp linux-2.6.32.27/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.27/arch/powerpc/platforms/ps3/system-bus.c
--- linux-2.6.32.27/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/platforms/ps3/system-bus.c 2010-12-09 18:12:58.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/platforms/ps3/system-bus.c 2010-12-31 14:46:53.000000000 -0500
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -2896,7 +2896,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
.map_sg = ps3_ioc0_map_sg,
diff -urNp linux-2.6.32.27/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.27/arch/powerpc/platforms/pseries/Kconfig
--- linux-2.6.32.27/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/powerpc/platforms/pseries/Kconfig 2010-12-09 18:12:58.000000000 -0500
++++ linux-2.6.32.27/arch/powerpc/platforms/pseries/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -2,6 +2,8 @@ config PPC_PSERIES
depends on PPC64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2908,7 +2908,7 @@ diff -urNp linux-2.6.32.27/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.2
select RTAS_ERROR_LOGGING
diff -urNp linux-2.6.32.27/arch/s390/include/asm/elf.h linux-2.6.32.27/arch/s390/include/asm/elf.h
--- linux-2.6.32.27/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/s390/include/asm/elf.h 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/s390/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
that it will "exec", and that there is sufficient room for the brk. */
#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2925,7 +2925,7 @@ diff -urNp linux-2.6.32.27/arch/s390/include/asm/elf.h linux-2.6.32.27/arch/s390
diff -urNp linux-2.6.32.27/arch/s390/include/asm/setup.h linux-2.6.32.27/arch/s390/include/asm/setup.h
--- linux-2.6.32.27/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/s390/include/asm/setup.h 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/s390/include/asm/setup.h 2010-12-31 14:46:53.000000000 -0500
@@ -50,13 +50,13 @@ extern unsigned long memory_end;
void detect_memory_layout(struct mem_chunk chunk[]);
@@ -2944,7 +2944,7 @@ diff -urNp linux-2.6.32.27/arch/s390/include/asm/setup.h linux-2.6.32.27/arch/s3
#endif
diff -urNp linux-2.6.32.27/arch/s390/include/asm/uaccess.h linux-2.6.32.27/arch/s390/include/asm/uaccess.h
--- linux-2.6.32.27/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/s390/include/asm/uaccess.h 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/s390/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -232,6 +232,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -2979,7 +2979,7 @@ diff -urNp linux-2.6.32.27/arch/s390/include/asm/uaccess.h linux-2.6.32.27/arch/
else
diff -urNp linux-2.6.32.27/arch/s390/Kconfig linux-2.6.32.27/arch/s390/Kconfig
--- linux-2.6.32.27/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/s390/Kconfig 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/s390/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -194,28 +194,26 @@ config AUDIT_ARCH
config S390_SWITCH_AMODE
@@ -3019,7 +3019,7 @@ diff -urNp linux-2.6.32.27/arch/s390/Kconfig linux-2.6.32.27/arch/s390/Kconfig
diff -urNp linux-2.6.32.27/arch/s390/kernel/module.c linux-2.6.32.27/arch/s390/kernel/module.c
--- linux-2.6.32.27/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/s390/kernel/module.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/s390/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -3093,7 +3093,7 @@ diff -urNp linux-2.6.32.27/arch/s390/kernel/module.c linux-2.6.32.27/arch/s390/k
*(unsigned int *) loc = val;
diff -urNp linux-2.6.32.27/arch/s390/kernel/setup.c linux-2.6.32.27/arch/s390/kernel/setup.c
--- linux-2.6.32.27/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/s390/kernel/setup.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/s390/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
early_param("mem", early_parse_mem);
@@ -3149,7 +3149,7 @@ diff -urNp linux-2.6.32.27/arch/s390/kernel/setup.c linux-2.6.32.27/arch/s390/ke
if (s390_noexec) {
diff -urNp linux-2.6.32.27/arch/s390/mm/mmap.c linux-2.6.32.27/arch/s390/mm/mmap.c
--- linux-2.6.32.27/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/s390/mm/mmap.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/s390/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -3198,7 +3198,7 @@ diff -urNp linux-2.6.32.27/arch/s390/mm/mmap.c linux-2.6.32.27/arch/s390/mm/mmap
}
diff -urNp linux-2.6.32.27/arch/score/include/asm/system.h linux-2.6.32.27/arch/score/include/asm/system.h
--- linux-2.6.32.27/arch/score/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/score/include/asm/system.h 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/score/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
@@ -17,7 +17,7 @@ do { \
#define finish_arch_switch(prev) do {} while (0)
@@ -3210,7 +3210,7 @@ diff -urNp linux-2.6.32.27/arch/score/include/asm/system.h linux-2.6.32.27/arch/
#define rmb() barrier()
diff -urNp linux-2.6.32.27/arch/score/kernel/process.c linux-2.6.32.27/arch/score/kernel/process.c
--- linux-2.6.32.27/arch/score/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/score/kernel/process.c 2010-12-09 18:12:56.000000000 -0500
++++ linux-2.6.32.27/arch/score/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
return task_pt_regs(task)->cp0_epc;
@@ -3222,7 +3222,7 @@ diff -urNp linux-2.6.32.27/arch/score/kernel/process.c linux-2.6.32.27/arch/scor
-}
diff -urNp linux-2.6.32.27/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.27/arch/sh/boards/mach-hp6xx/pm.c
--- linux-2.6.32.27/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sh/boards/mach-hp6xx/pm.c 2010-12-09 18:12:59.000000000 -0500
++++ linux-2.6.32.27/arch/sh/boards/mach-hp6xx/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
@@ -3234,7 +3234,7 @@ diff -urNp linux-2.6.32.27/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.27/arch/s
};
diff -urNp linux-2.6.32.27/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.27/arch/sh/kernel/cpu/sh4/sq.c
--- linux-2.6.32.27/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sh/kernel/cpu/sh4/sq.c 2010-12-09 18:12:58.000000000 -0500
++++ linux-2.6.32.27/arch/sh/kernel/cpu/sh4/sq.c 2010-12-31 14:46:53.000000000 -0500
@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
NULL,
};
@@ -3246,7 +3246,7 @@ diff -urNp linux-2.6.32.27/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.27/arch/sh/k
};
diff -urNp linux-2.6.32.27/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.27/arch/sh/kernel/cpu/shmobile/pm.c
--- linux-2.6.32.27/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sh/kernel/cpu/shmobile/pm.c 2010-12-09 18:12:58.000000000 -0500
++++ linux-2.6.32.27/arch/sh/kernel/cpu/shmobile/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
@@ -3258,7 +3258,7 @@ diff -urNp linux-2.6.32.27/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.27/arch
};
diff -urNp linux-2.6.32.27/arch/sh/kernel/kgdb.c linux-2.6.32.27/arch/sh/kernel/kgdb.c
--- linux-2.6.32.27/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sh/kernel/kgdb.c 2010-12-09 18:12:58.000000000 -0500
++++ linux-2.6.32.27/arch/sh/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3270,7 +3270,7 @@ diff -urNp linux-2.6.32.27/arch/sh/kernel/kgdb.c linux-2.6.32.27/arch/sh/kernel/
.gdb_bpt_instr = { 0x3c, 0xc3 },
diff -urNp linux-2.6.32.27/arch/sh/mm/mmap.c linux-2.6.32.27/arch/sh/mm/mmap.c
--- linux-2.6.32.27/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sh/mm/mmap.c 2010-12-09 18:12:59.000000000 -0500
++++ linux-2.6.32.27/arch/sh/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
@@ -3320,7 +3320,7 @@ diff -urNp linux-2.6.32.27/arch/sh/mm/mmap.c linux-2.6.32.27/arch/sh/mm/mmap.c
}
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/atomic_64.h linux-2.6.32.27/arch/sparc/include/asm/atomic_64.h
--- linux-2.6.32.27/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/atomic_64.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3473,7 +3473,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/atomic_64.h linux-2.6.32.27/ar
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.27/arch/sparc/include/asm/dma-mapping.h
--- linux-2.6.32.27/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/dma-mapping.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
#define dma_is_consistent(d, h) (1)
@@ -3507,7 +3507,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.27/
ops->free_coherent(dev, size, cpu_addr, dma_handle);
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/elf_32.h linux-2.6.32.27/arch/sparc/include/asm/elf_32.h
--- linux-2.6.32.27/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/elf_32.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/elf_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -116,6 +116,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3524,7 +3524,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/elf_32.h linux-2.6.32.27/arch/
on Sparc. */
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/elf_64.h linux-2.6.32.27/arch/sparc/include/asm/elf_64.h
--- linux-2.6.32.27/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/elf_64.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/elf_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -163,6 +163,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3540,7 +3540,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/elf_64.h linux-2.6.32.27/arch/
instruction set this cpu supports. */
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.27/arch/sparc/include/asm/pgtable_32.h
--- linux-2.6.32.27/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/pgtable_32.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3574,7 +3574,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.27/a
#ifdef MODULE
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.27/arch/sparc/include/asm/pgtsrmmu.h
--- linux-2.6.32.27/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/pgtsrmmu.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/pgtsrmmu.h 2010-12-31 14:46:53.000000000 -0500
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3591,7 +3591,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.27/arc
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.27/arch/sparc/include/asm/spinlock_64.h
--- linux-2.6.32.27/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/spinlock_64.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/spinlock_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
@@ -3645,7 +3645,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.27/
" bne,pn %%xcc, 1b\n"
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.27/arch/sparc/include/asm/uaccess_32.h
--- linux-2.6.32.27/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/uaccess_32.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/uaccess_32.h 2010-12-31 14:46:53.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)
@@ -3699,7 +3699,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.27/a
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.27/arch/sparc/include/asm/uaccess_64.h
--- linux-2.6.32.27/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/uaccess_64.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/uaccess_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -3744,7 +3744,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.27/a
return ret;
diff -urNp linux-2.6.32.27/arch/sparc/include/asm/uaccess.h linux-2.6.32.27/arch/sparc/include/asm/uaccess.h
--- linux-2.6.32.27/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/include/asm/uaccess.h 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
@@ -3761,7 +3761,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/include/asm/uaccess.h linux-2.6.32.27/arch
#else
diff -urNp linux-2.6.32.27/arch/sparc/kernel/iommu.c linux-2.6.32.27/arch/sparc/kernel/iommu.c
--- linux-2.6.32.27/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/iommu.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3782,7 +3782,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/iommu.c linux-2.6.32.27/arch/sparc/
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
diff -urNp linux-2.6.32.27/arch/sparc/kernel/ioport.c linux-2.6.32.27/arch/sparc/kernel/ioport.c
--- linux-2.6.32.27/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/ioport.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -3812,7 +3812,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/ioport.c linux-2.6.32.27/arch/sparc
.map_page = pci32_map_page,
diff -urNp linux-2.6.32.27/arch/sparc/kernel/kgdb_32.c linux-2.6.32.27/arch/sparc/kernel/kgdb_32.c
--- linux-2.6.32.27/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/kgdb_32.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/kgdb_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3824,7 +3824,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/kgdb_32.c linux-2.6.32.27/arch/spar
};
diff -urNp linux-2.6.32.27/arch/sparc/kernel/kgdb_64.c linux-2.6.32.27/arch/sparc/kernel/kgdb_64.c
--- linux-2.6.32.27/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/kgdb_64.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/kgdb_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3836,7 +3836,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/kgdb_64.c linux-2.6.32.27/arch/spar
};
diff -urNp linux-2.6.32.27/arch/sparc/kernel/Makefile linux-2.6.32.27/arch/sparc/kernel/Makefile
--- linux-2.6.32.27/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/Makefile 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -3,7 +3,7 @@
#
@@ -3848,7 +3848,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/Makefile linux-2.6.32.27/arch/sparc
extra-y += init_task.o
diff -urNp linux-2.6.32.27/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.27/arch/sparc/kernel/pci_sun4v.c
--- linux-2.6.32.27/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/pci_sun4v.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/pci_sun4v.c 2010-12-31 14:46:53.000000000 -0500
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3860,7 +3860,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.27/arch/sp
.map_page = dma_4v_map_page,
diff -urNp linux-2.6.32.27/arch/sparc/kernel/process_32.c linux-2.6.32.27/arch/sparc/kernel/process_32.c
--- linux-2.6.32.27/arch/sparc/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/process_32.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/process_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
rw->ins[4], rw->ins[5],
rw->ins[6],
@@ -3898,7 +3898,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/process_32.c linux-2.6.32.27/arch/s
printk("\n");
diff -urNp linux-2.6.32.27/arch/sparc/kernel/process_64.c linux-2.6.32.27/arch/sparc/kernel/process_64.c
--- linux-2.6.32.27/arch/sparc/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/process_64.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/process_64.c 2010-12-31 14:46:53.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]);
@@ -3936,7 +3936,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/process_64.c linux-2.6.32.27/arch/s
(void *) gp->i7,
diff -urNp linux-2.6.32.27/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.27/arch/sparc/kernel/sys_sparc_32.c
--- linux-2.6.32.27/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/sys_sparc_32.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/sys_sparc_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -3957,7 +3957,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.27/arch
if (flags & MAP_SHARED)
diff -urNp linux-2.6.32.27/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.27/arch/sparc/kernel/sys_sparc_64.c
--- linux-2.6.32.27/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/sys_sparc_64.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/sys_sparc_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -4080,7 +4080,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.27/arch
}
diff -urNp linux-2.6.32.27/arch/sparc/kernel/traps_32.c linux-2.6.32.27/arch/sparc/kernel/traps_32.c
--- linux-2.6.32.27/arch/sparc/kernel/traps_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/traps_32.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/traps_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
count++ < 30 &&
(((unsigned long) rw) >= PAGE_OFFSET) &&
@@ -4092,7 +4092,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/traps_32.c linux-2.6.32.27/arch/spa
}
diff -urNp linux-2.6.32.27/arch/sparc/kernel/traps_64.c linux-2.6.32.27/arch/sparc/kernel/traps_64.c
--- linux-2.6.32.27/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/traps_64.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/traps_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -4204,7 +4204,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/traps_64.c linux-2.6.32.27/arch/spa
rw = kernel_stack_up(rw);
diff -urNp linux-2.6.32.27/arch/sparc/kernel/unaligned_64.c linux-2.6.32.27/arch/sparc/kernel/unaligned_64.c
--- linux-2.6.32.27/arch/sparc/kernel/unaligned_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/kernel/unaligned_64.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/kernel/unaligned_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs
if (count < 5) {
last_time = jiffies;
@@ -4216,7 +4216,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/kernel/unaligned_64.c linux-2.6.32.27/arch
}
diff -urNp linux-2.6.32.27/arch/sparc/lib/atomic_64.S linux-2.6.32.27/arch/sparc/lib/atomic_64.S
--- linux-2.6.32.27/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/lib/atomic_64.S 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/lib/atomic_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -4453,7 +4453,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/lib/atomic_64.S linux-2.6.32.27/arch/sparc
bne,pn %xcc, 2f
diff -urNp linux-2.6.32.27/arch/sparc/lib/ksyms.c linux-2.6.32.27/arch/sparc/lib/ksyms.c
--- linux-2.6.32.27/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/lib/ksyms.c 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/lib/ksyms.c 2010-12-31 14:46:53.000000000 -0500
@@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -4474,7 +4474,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/lib/ksyms.c linux-2.6.32.27/arch/sparc/lib
/* Atomic bit operations. */
diff -urNp linux-2.6.32.27/arch/sparc/lib/rwsem_64.S linux-2.6.32.27/arch/sparc/lib/rwsem_64.S
--- linux-2.6.32.27/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/lib/rwsem_64.S 2010-12-09 18:13:02.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/lib/rwsem_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
@@ -4575,7 +4575,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/lib/rwsem_64.S linux-2.6.32.27/arch/sparc/
bne,pn %icc, 1b
diff -urNp linux-2.6.32.27/arch/sparc/Makefile linux-2.6.32.27/arch/sparc/Makefile
--- linux-2.6.32.27/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/Makefile 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/Makefile 2010-12-31 14:46:53.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
@@ -4587,7 +4587,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/Makefile linux-2.6.32.27/arch/sparc/Makefi
diff -urNp linux-2.6.32.27/arch/sparc/mm/fault_32.c linux-2.6.32.27/arch/sparc/mm/fault_32.c
--- linux-2.6.32.27/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/mm/fault_32.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/mm/fault_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -21,6 +21,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -4893,7 +4893,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/mm/fault_32.c linux-2.6.32.27/arch/sparc/m
goto bad_area;
diff -urNp linux-2.6.32.27/arch/sparc/mm/fault_64.c linux-2.6.32.27/arch/sparc/mm/fault_64.c
--- linux-2.6.32.27/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/mm/fault_64.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/mm/fault_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -20,6 +20,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -5402,7 +5402,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/mm/fault_64.c linux-2.6.32.27/arch/sparc/m
* was no match. So in such a case we (carefully) read the
diff -urNp linux-2.6.32.27/arch/sparc/mm/hugetlbpage.c linux-2.6.32.27/arch/sparc/mm/hugetlbpage.c
--- linux-2.6.32.27/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/mm/hugetlbpage.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
@@ -69,7 +69,7 @@ full_search:
}
return -ENOMEM;
@@ -5442,7 +5442,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/mm/hugetlbpage.c linux-2.6.32.27/arch/spar
if (mm->get_unmapped_area == arch_get_unmapped_area)
diff -urNp linux-2.6.32.27/arch/sparc/mm/init_32.c linux-2.6.32.27/arch/sparc/mm/init_32.c
--- linux-2.6.32.27/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/mm/init_32.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -317,6 +317,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -5479,7 +5479,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/mm/init_32.c linux-2.6.32.27/arch/sparc/mm
protection_map[14] = PAGE_SHARED;
diff -urNp linux-2.6.32.27/arch/sparc/mm/Makefile linux-2.6.32.27/arch/sparc/mm/Makefile
--- linux-2.6.32.27/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/mm/Makefile 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/mm/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -2,7 +2,7 @@
#
@@ -5491,7 +5491,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/mm/Makefile linux-2.6.32.27/arch/sparc/mm/
obj-y += fault_$(BITS).o
diff -urNp linux-2.6.32.27/arch/sparc/mm/srmmu.c linux-2.6.32.27/arch/sparc/mm/srmmu.c
--- linux-2.6.32.27/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/sparc/mm/srmmu.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/sparc/mm/srmmu.c 2010-12-31 14:46:53.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));
@@ -5508,7 +5508,7 @@ diff -urNp linux-2.6.32.27/arch/sparc/mm/srmmu.c linux-2.6.32.27/arch/sparc/mm/s
diff -urNp linux-2.6.32.27/arch/um/include/asm/kmap_types.h linux-2.6.32.27/arch/um/include/asm/kmap_types.h
--- linux-2.6.32.27/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/um/include/asm/kmap_types.h 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/um/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -5519,7 +5519,7 @@ diff -urNp linux-2.6.32.27/arch/um/include/asm/kmap_types.h linux-2.6.32.27/arch
diff -urNp linux-2.6.32.27/arch/um/include/asm/page.h linux-2.6.32.27/arch/um/include/asm/page.h
--- linux-2.6.32.27/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/um/include/asm/page.h 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/um/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -5532,7 +5532,7 @@ diff -urNp linux-2.6.32.27/arch/um/include/asm/page.h linux-2.6.32.27/arch/um/in
struct page;
diff -urNp linux-2.6.32.27/arch/um/kernel/process.c linux-2.6.32.27/arch/um/kernel/process.c
--- linux-2.6.32.27/arch/um/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/um/kernel/process.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/um/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -393,22 +393,6 @@ int singlestepping(void * t)
return 2;
}
@@ -5558,7 +5558,7 @@ diff -urNp linux-2.6.32.27/arch/um/kernel/process.c linux-2.6.32.27/arch/um/kern
unsigned long stack_page, sp, ip;
diff -urNp linux-2.6.32.27/arch/um/sys-i386/syscalls.c linux-2.6.32.27/arch/um/sys-i386/syscalls.c
--- linux-2.6.32.27/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/um/sys-i386/syscalls.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/arch/um/sys-i386/syscalls.c 2010-12-31 14:46:53.000000000 -0500
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -5583,7 +5583,7 @@ diff -urNp linux-2.6.32.27/arch/um/sys-i386/syscalls.c linux-2.6.32.27/arch/um/s
* calls. Linux/i386 didn't use to be able to handle more than
diff -urNp linux-2.6.32.27/arch/x86/boot/bitops.h linux-2.6.32.27/arch/x86/boot/bitops.h
--- linux-2.6.32.27/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/bitops.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/bitops.h 2010-12-31 14:46:53.000000000 -0500
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -5604,7 +5604,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/bitops.h linux-2.6.32.27/arch/x86/boot/
#endif /* BOOT_BITOPS_H */
diff -urNp linux-2.6.32.27/arch/x86/boot/boot.h linux-2.6.32.27/arch/x86/boot/boot.h
--- linux-2.6.32.27/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/boot.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/boot.h 2010-12-31 14:46:53.000000000 -0500
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -5625,7 +5625,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/boot.h linux-2.6.32.27/arch/x86/boot/bo
}
diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/head_32.S linux-2.6.32.27/arch/x86/boot/compressed/head_32.S
--- linux-2.6.32.27/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/compressed/head_32.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/compressed/head_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5656,7 +5656,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/head_32.S linux-2.6.32.27/ar
2:
diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/head_64.S linux-2.6.32.27/arch/x86/boot/compressed/head_64.S
--- linux-2.6.32.27/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/compressed/head_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/compressed/head_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5677,7 +5677,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/head_64.S linux-2.6.32.27/ar
/* Target address to relocate to for decompression */
diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/misc.c linux-2.6.32.27/arch/x86/boot/compressed/misc.c
--- linux-2.6.32.27/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/compressed/misc.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/compressed/misc.c 2010-12-31 14:46:53.000000000 -0500
@@ -288,7 +288,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -5698,7 +5698,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/misc.c linux-2.6.32.27/arch/
diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.27/arch/x86/boot/compressed/mkpiggy.c
--- linux-2.6.32.27/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/compressed/mkpiggy.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/compressed/mkpiggy.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
@@ -5710,7 +5710,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.27/ar
printf(".section \".rodata.compressed\",\"a\",@progbits\n");
diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/relocs.c linux-2.6.32.27/arch/x86/boot/compressed/relocs.c
--- linux-2.6.32.27/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/compressed/relocs.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/compressed/relocs.c 2010-12-31 14:46:53.000000000 -0500
@@ -10,8 +10,11 @@
#define USE_BSD
#include <endian.h>
@@ -5913,7 +5913,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/compressed/relocs.c linux-2.6.32.27/arc
read_symtabs(fp);
diff -urNp linux-2.6.32.27/arch/x86/boot/cpucheck.c linux-2.6.32.27/arch/x86/boot/cpucheck.c
--- linux-2.6.32.27/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/cpucheck.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/cpucheck.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -6011,7 +6011,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/cpucheck.c linux-2.6.32.27/arch/x86/boo
}
diff -urNp linux-2.6.32.27/arch/x86/boot/header.S linux-2.6.32.27/arch/x86/boot/header.S
--- linux-2.6.32.27/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/header.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/header.S 2010-12-31 14:46:53.000000000 -0500
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -6023,7 +6023,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/header.S linux-2.6.32.27/arch/x86/boot/
#define VO_INIT_SIZE (VO__end - VO__text)
diff -urNp linux-2.6.32.27/arch/x86/boot/memory.c linux-2.6.32.27/arch/x86/boot/memory.c
--- linux-2.6.32.27/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/memory.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/memory.c 2010-12-31 14:46:53.000000000 -0500
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
@@ -6035,7 +6035,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/memory.c linux-2.6.32.27/arch/x86/boot/
static struct e820entry buf; /* static so it is zeroed */
diff -urNp linux-2.6.32.27/arch/x86/boot/video.c linux-2.6.32.27/arch/x86/boot/video.c
--- linux-2.6.32.27/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/video.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/video.c 2010-12-31 14:46:53.000000000 -0500
@@ -90,7 +90,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
@@ -6047,7 +6047,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/video.c linux-2.6.32.27/arch/x86/boot/v
diff -urNp linux-2.6.32.27/arch/x86/boot/video-vesa.c linux-2.6.32.27/arch/x86/boot/video-vesa.c
--- linux-2.6.32.27/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/boot/video-vesa.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/boot/video-vesa.c 2010-12-31 14:46:53.000000000 -0500
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -6058,7 +6058,7 @@ diff -urNp linux-2.6.32.27/arch/x86/boot/video-vesa.c linux-2.6.32.27/arch/x86/b
/*
diff -urNp linux-2.6.32.27/arch/x86/ia32/ia32_aout.c linux-2.6.32.27/arch/x86/ia32/ia32_aout.c
--- linux-2.6.32.27/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/ia32/ia32_aout.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/ia32/ia32_aout.c 2010-12-31 14:46:53.000000000 -0500
@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
unsigned long dump_start, dump_size;
struct user32 dump;
@@ -6083,7 +6083,7 @@ diff -urNp linux-2.6.32.27/arch/x86/ia32/ia32_aout.c linux-2.6.32.27/arch/x86/ia
return has_dumped;
diff -urNp linux-2.6.32.27/arch/x86/ia32/ia32entry.S linux-2.6.32.27/arch/x86/ia32/ia32entry.S
--- linux-2.6.32.27/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/ia32/ia32entry.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/ia32/ia32entry.S 2010-12-31 14:46:53.000000000 -0500
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -6180,7 +6180,7 @@ diff -urNp linux-2.6.32.27/arch/x86/ia32/ia32entry.S linux-2.6.32.27/arch/x86/ia
* disabled irqs and here we enable it straight after entry:
diff -urNp linux-2.6.32.27/arch/x86/ia32/ia32_signal.c linux-2.6.32.27/arch/x86/ia32/ia32_signal.c
--- linux-2.6.32.27/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/ia32/ia32_signal.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/ia32/ia32_signal.c 2010-12-31 14:46:53.000000000 -0500
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
@@ -6232,7 +6232,7 @@ diff -urNp linux-2.6.32.27/arch/x86/ia32/ia32_signal.c linux-2.6.32.27/arch/x86/
if (err)
diff -urNp linux-2.6.32.27/arch/x86/include/asm/alternative.h linux-2.6.32.27/arch/x86/include/asm/alternative.h
--- linux-2.6.32.27/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/alternative.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/alternative.h 2010-12-31 14:46:53.000000000 -0500
@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
" .byte 662b-661b\n" /* sourcelen */ \
" .byte 664f-663f\n" /* replacementlen */ \
@@ -6244,7 +6244,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/alternative.h linux-2.6.32.27/ar
diff -urNp linux-2.6.32.27/arch/x86/include/asm/apm.h linux-2.6.32.27/arch/x86/include/asm/apm.h
--- linux-2.6.32.27/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/apm.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/apm.h 2010-12-31 14:46:53.000000000 -0500
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -6265,7 +6265,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/apm.h linux-2.6.32.27/arch/x86/i
"popl %%edi\n\t"
diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch/x86/include/asm/atomic_32.h
--- linux-2.6.32.27/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/atomic_32.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/atomic_32.h 2010-12-31 14:46:58.000000000 -0500
@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
}
@@ -6313,7 +6313,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
+ LOCK_PREFIX "subl %1,%0\n"
-+ "into\n0:\n"
++ "int $4\n0:\n"
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
@@ -6344,7 +6344,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
+ LOCK_PREFIX "addl %1,%0\n"
-+ "into\n0:\n"
++ "int $4\n0:\n"
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
@@ -6375,7 +6375,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
+ LOCK_PREFIX "addl %2,%0\n"
-+ "into\n0:\n"
++ "int $4\n0:\n"
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
@@ -6383,7 +6383,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
: "+m" (v->counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -91,7 +167,30 @@ static inline int atomic_sub_and_test(in
+@@ -91,7 +167,27 @@ static inline int atomic_sub_and_test(in
*/
static inline void atomic_inc(atomic_t *v)
{
@@ -6391,13 +6391,10 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+ asm volatile(LOCK_PREFIX "incl %0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+ "into\n0:\n"
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
++ "jno 0f\n"
+ LOCK_PREFIX "decl %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ : "+m" (v->counter));
@@ -6415,7 +6412,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
: "+m" (v->counter));
}
-@@ -103,7 +202,30 @@ static inline void atomic_inc(atomic_t *
+@@ -103,7 +199,27 @@ static inline void atomic_inc(atomic_t *
*/
static inline void atomic_dec(atomic_t *v)
{
@@ -6423,13 +6420,10 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+ asm volatile(LOCK_PREFIX "decl %0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+ "into\n0:\n"
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1: \n"
++ "jno 0f\n"
+ LOCK_PREFIX "incl %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ : "+m" (v->counter));
@@ -6447,7 +6441,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
: "+m" (v->counter));
}
-@@ -119,7 +241,19 @@ static inline int atomic_dec_and_test(at
+@@ -119,7 +235,16 @@ static inline int atomic_dec_and_test(at
{
unsigned char c;
@@ -6455,20 +6449,17 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+ asm volatile(LOCK_PREFIX "decl %0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+ "into\n0:\n"
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1: \n"
++ "jno 0f\n"
+ LOCK_PREFIX "incl %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ "sete %1\n"
: "+m" (v->counter), "=qm" (c)
: : "memory");
return c != 0;
-@@ -137,7 +271,19 @@ static inline int atomic_inc_and_test(at
+@@ -137,7 +262,16 @@ static inline int atomic_inc_and_test(at
{
unsigned char c;
@@ -6476,20 +6467,17 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+ asm volatile(LOCK_PREFIX "incl %0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+ "into\n0:\n"
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1: \n"
++ "jno 0f\n"
+ LOCK_PREFIX "decl %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "into\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ "sete %1\n"
: "+m" (v->counter), "=qm" (c)
: : "memory");
return c != 0;
-@@ -156,7 +302,16 @@ static inline int atomic_add_negative(in
+@@ -156,7 +290,16 @@ static inline int atomic_add_negative(in
{
unsigned char c;
@@ -6499,7 +6487,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
+ LOCK_PREFIX "subl %2,%0\n"
-+ "into\n0:\n"
++ "int $4\n0:\n"
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
@@ -6507,7 +6495,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
: "+m" (v->counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -179,6 +334,46 @@ static inline int atomic_add_return(int
+@@ -179,6 +322,46 @@ static inline int atomic_add_return(int
#endif
/* Modern 486+ processor */
__i = i;
@@ -6516,7 +6504,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
+ "movl %0, %1\n"
-+ "into\n0:\n"
++ "int $4\n0:\n"
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
@@ -6554,7 +6542,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
asm volatile(LOCK_PREFIX "xaddl %0, %1"
: "+r" (i), "+m" (v->counter)
: : "memory");
-@@ -227,22 +422,39 @@ static inline int atomic_xchg(atomic_t *
+@@ -227,22 +410,39 @@ static inline int atomic_xchg(atomic_t *
*/
static inline int atomic_add_unless(atomic_t *v, int a, int u)
{
@@ -6572,7 +6560,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
+ "subl %2,%0\n"
-+ "into\n0:\n"
++ "int $4\n0:\n"
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
@@ -6598,7 +6586,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
#define atomic_dec_return(v) (atomic_sub_return(1, v))
/* These are x86-specific, used by some header files */
-@@ -266,6 +478,14 @@ typedef struct {
+@@ -266,6 +466,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
@@ -6615,7 +6603,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_32.h linux-2.6.32.27/arch
extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_64.h linux-2.6.32.27/arch/x86/include/asm/atomic_64.h
--- linux-2.6.32.27/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/atomic_64.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
}
@@ -7221,7 +7209,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/atomic_64.h linux-2.6.32.27/arch
/**
diff -urNp linux-2.6.32.27/arch/x86/include/asm/bitops.h linux-2.6.32.27/arch/x86/include/asm/bitops.h
--- linux-2.6.32.27/arch/x86/include/asm/bitops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/bitops.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/bitops.h 2010-12-31 14:46:53.000000000 -0500
@@ -38,7 +38,7 @@
* a mask operation on a byte.
*/
@@ -7233,7 +7221,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/bitops.h linux-2.6.32.27/arch/x8
/**
diff -urNp linux-2.6.32.27/arch/x86/include/asm/boot.h linux-2.6.32.27/arch/x86/include/asm/boot.h
--- linux-2.6.32.27/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/boot.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/boot.h 2010-12-31 14:46:53.000000000 -0500
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -7253,7 +7241,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/boot.h linux-2.6.32.27/arch/x86/
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
diff -urNp linux-2.6.32.27/arch/x86/include/asm/cacheflush.h linux-2.6.32.27/arch/x86/include/asm/cacheflush.h
--- linux-2.6.32.27/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/cacheflush.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/cacheflush.h 2010-12-31 14:46:53.000000000 -0500
@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
static inline unsigned long get_page_memtype(struct page *pg)
{
@@ -7274,7 +7262,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/cacheflush.h linux-2.6.32.27/arc
break;
diff -urNp linux-2.6.32.27/arch/x86/include/asm/cache.h linux-2.6.32.27/arch/x86/include/asm/cache.h
--- linux-2.6.32.27/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/cache.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/cache.h 2010-12-31 14:46:53.000000000 -0500
@@ -8,6 +8,7 @@
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
@@ -7285,7 +7273,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/cache.h linux-2.6.32.27/arch/x86
/* vSMP Internode cacheline shift */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/checksum_32.h linux-2.6.32.27/arch/x86/include/asm/checksum_32.h
--- linux-2.6.32.27/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/checksum_32.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/checksum_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -7321,7 +7309,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/checksum_32.h linux-2.6.32.27/ar
if (len)
diff -urNp linux-2.6.32.27/arch/x86/include/asm/desc.h linux-2.6.32.27/arch/x86/include/asm/desc.h
--- linux-2.6.32.27/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/desc.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/desc.h 2010-12-31 14:46:53.000000000 -0500
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -7493,7 +7481,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/desc.h linux-2.6.32.27/arch/x86/
#endif /* _ASM_X86_DESC_H */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/device.h linux-2.6.32.27/arch/x86/include/asm/device.h
--- linux-2.6.32.27/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/device.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -7505,7 +7493,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/device.h linux-2.6.32.27/arch/x8
void *iommu; /* hook for IOMMU specific extension */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/dma-mapping.h linux-2.6.32.27/arch/x86/include/asm/dma-mapping.h
--- linux-2.6.32.27/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/dma-mapping.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -25,9 +25,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -7547,7 +7535,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/dma-mapping.h linux-2.6.32.27/ar
diff -urNp linux-2.6.32.27/arch/x86/include/asm/e820.h linux-2.6.32.27/arch/x86/include/asm/e820.h
--- linux-2.6.32.27/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/e820.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/e820.h 2010-12-31 14:46:53.000000000 -0500
@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
#define ISA_END_ADDRESS 0x100000
#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -7559,7 +7547,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/e820.h linux-2.6.32.27/arch/x86/
#ifdef __KERNEL__
diff -urNp linux-2.6.32.27/arch/x86/include/asm/elf.h linux-2.6.32.27/arch/x86/include/asm/elf.h
--- linux-2.6.32.27/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/elf.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -257,7 +257,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. */
@@ -7615,46 +7603,11 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/elf.h linux-2.6.32.27/arch/x86/i
#endif /* _ASM_X86_ELF_H */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/futex.h linux-2.6.32.27/arch/x86/include/asm/futex.h
--- linux-2.6.32.27/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/futex.h 2010-12-09 18:12:55.000000000 -0500
-@@ -11,17 +11,54 @@
- #include <asm/processor.h>
++++ linux-2.6.32.27/arch/x86/include/asm/futex.h 2010-12-31 14:47:00.000000000 -0500
+@@ -12,16 +12,18 @@
#include <asm/system.h>
-+#ifdef CONFIG_X86_32
#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
-+ asm volatile( \
-+ "movw\t%w6, %%ds\n" \
-+ "1:\t" insn "\n" \
-+ "2:\tpushl\t%%ss\n" \
-+ "\tpopl\t%%ds\n" \
-+ "\t.section .fixup,\"ax\"\n" \
-+ "3:\tmov\t%3, %1\n" \
-+ "\tjmp\t2b\n" \
-+ "\t.previous\n" \
-+ _ASM_EXTABLE(1b, 3b) \
-+ : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
-+ : "i" (-EFAULT), "0" (oparg), "1" (0), "r" (__USER_DS))
-+
-+#define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
-+ asm volatile("movw\t%w7, %%es\n" \
-+ "1:\tmovl\t%%es:%2, %0\n" \
-+ "\tmovl\t%0, %3\n" \
-+ "\t" insn "\n" \
-+ "2:\t" LOCK_PREFIX "cmpxchgl %3, %%es:%2\n"\
-+ "\tjnz\t1b\n" \
-+ "3:\tpushl\t%%ss\n" \
-+ "\tpopl\t%%es\n" \
-+ "\t.section .fixup,\"ax\"\n" \
-+ "4:\tmov\t%5, %1\n" \
-+ "\tjmp\t3b\n" \
-+ "\t.previous\n" \
-+ _ASM_EXTABLE(1b, 4b) \
-+ _ASM_EXTABLE(2b, 4b) \
-+ : "=&a" (oldval), "=&r" (ret), \
-+ "+m" (*uaddr), "=&r" (tem) \
-+ : "r" (oparg), "i" (-EFAULT), "1" (0), "r" (__USER_DS))
-+#else
-+#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
+ typecheck(u32 *, uaddr); \
asm volatile("1:\t" insn "\n" \
"2:\t.section .fixup,\"ax\"\n" \
@@ -7663,8 +7616,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/futex.h linux-2.6.32.27/arch/x86
"\t.previous\n" \
_ASM_EXTABLE(1b, 3b) \
- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
-+ : "=r" (oldval), "=r" (ret), \
-+ "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4))\
++ : "=r" (oldval), "=r" (ret), "+m" (*____m(uaddr))\
: "i" (-EFAULT), "0" (oparg), "1" (0))
#define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
@@ -7672,43 +7624,33 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/futex.h linux-2.6.32.27/arch/x86
asm volatile("1:\tmovl %2, %0\n" \
"\tmovl\t%0, %3\n" \
"\t" insn "\n" \
-@@ -34,10 +71,12 @@
+@@ -34,10 +36,10 @@
_ASM_EXTABLE(1b, 4b) \
_ASM_EXTABLE(2b, 4b) \
: "=&a" (oldval), "=&r" (ret), \
- "+m" (*uaddr), "=&r" (tem) \
-+ "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4)),\
-+ "=&r" (tem) \
++ "+m" (*(____m(uaddr))), "=&r" (tem) \
: "r" (oparg), "i" (-EFAULT), "1" (0))
-+#endif
-static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
+static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
{
int op = (encoded_op >> 28) & 7;
int cmp = (encoded_op >> 24) & 15;
-@@ -61,11 +100,20 @@ static inline int futex_atomic_op_inuser
+@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser
switch (op) {
case FUTEX_OP_SET:
-+#ifdef CONFIG_X86_32
-+ __futex_atomic_op1("xchgl %0, %%ds:%2", ret, oldval, uaddr, oparg);
-+#else
- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
-+#endif
+- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
++ __futex_atomic_op1("xchgl %0, "__copyuser_seg"%2", ret, oldval, uaddr, oparg);
break;
case FUTEX_OP_ADD:
-+#ifdef CONFIG_X86_32
-+ __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %%ds:%2", ret, oldval,
-+ uaddr, oparg);
-+#else
- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
+- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
++ __futex_atomic_op1(LOCK_PREFIX "xaddl %0, "__copyuser_seg"%2", ret, oldval,
uaddr, oparg);
-+#endif
break;
case FUTEX_OP_OR:
- __futex_atomic_op2("orl %4, %3", ret, oldval, uaddr, oparg);
-@@ -109,7 +157,7 @@ static inline int futex_atomic_op_inuser
+@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser
return ret;
}
@@ -7717,7 +7659,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/futex.h linux-2.6.32.27/arch/x86
int newval)
{
-@@ -119,17 +167,31 @@ static inline int futex_atomic_cmpxchg_i
+@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_i
return -ENOSYS;
#endif
@@ -7726,35 +7668,20 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/futex.h linux-2.6.32.27/arch/x86
return -EFAULT;
- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
-- "2:\t.section .fixup, \"ax\"\n"
-+ asm volatile(
-+#ifdef CONFIG_X86_32
-+ "\tmovw %w5, %%ds\n"
-+ "1:\t" LOCK_PREFIX "cmpxchgl %3, %%ds:%1\n"
-+ "2:\tpushl %%ss\n"
-+ "\tpopl %%ds\n"
-+#else
-+ "1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
-+ "2:\n"
-+#endif
-+ "\t.section .fixup, \"ax\"\n"
++ asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, "__copyuser_seg"%1\n"
+ "2:\t.section .fixup, \"ax\"\n"
"3:\tmov %2, %0\n"
"\tjmp 2b\n"
"\t.previous\n"
_ASM_EXTABLE(1b, 3b)
-+#ifdef CONFIG_X86_32
- : "=a" (oldval), "+m" (*uaddr)
-+ : "i" (-EFAULT), "r" (newval), "0" (oldval), "r" (__USER_DS)
-+#else
-+ : "=a" (oldval), "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4))
+- : "=a" (oldval), "+m" (*uaddr)
++ : "=a" (oldval), "+m" (*____m(uaddr))
: "i" (-EFAULT), "r" (newval), "0" (oldval)
-+#endif
: "memory"
);
-
diff -urNp linux-2.6.32.27/arch/x86/include/asm/i387.h linux-2.6.32.27/arch/x86/include/asm/i387.h
--- linux-2.6.32.27/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/i387.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/i387.h 2010-12-31 14:46:53.000000000 -0500
@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -7797,7 +7724,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/i387.h linux-2.6.32.27/arch/x86/
* These must be called with preempt disabled
diff -urNp linux-2.6.32.27/arch/x86/include/asm/io_64.h linux-2.6.32.27/arch/x86/include/asm/io_64.h
--- linux-2.6.32.27/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/io_64.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/io_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -140,6 +140,17 @@ __OUTS(l)
#include <linux/vmalloc.h>
@@ -7818,7 +7745,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/io_64.h linux-2.6.32.27/arch/x86
void __memcpy_fromio(void *, unsigned long, unsigned);
diff -urNp linux-2.6.32.27/arch/x86/include/asm/iommu.h linux-2.6.32.27/arch/x86/include/asm/iommu.h
--- linux-2.6.32.27/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/iommu.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
@@ -3,7 +3,7 @@
extern void pci_iommu_shutdown(void);
@@ -7830,7 +7757,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/iommu.h linux-2.6.32.27/arch/x86
extern int iommu_pass_through;
diff -urNp linux-2.6.32.27/arch/x86/include/asm/irqflags.h linux-2.6.32.27/arch/x86/include/asm/irqflags.h
--- linux-2.6.32.27/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/irqflags.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/irqflags.h 2010-12-31 14:46:53.000000000 -0500
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
sti; \
sysexit
@@ -7845,7 +7772,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/irqflags.h linux-2.6.32.27/arch/
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
diff -urNp linux-2.6.32.27/arch/x86/include/asm/kvm_host.h linux-2.6.32.27/arch/x86/include/asm/kvm_host.h
--- linux-2.6.32.27/arch/x86/include/asm/kvm_host.h 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/include/asm/kvm_host.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
@@ -533,7 +533,7 @@ struct kvm_x86_ops {
const struct trace_print_flags *exit_reasons_str;
};
@@ -7857,8 +7784,8 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/kvm_host.h linux-2.6.32.27/arch/
void kvm_mmu_module_exit(void);
diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86/include/asm/local.h
--- linux-2.6.32.27/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/local.h 2010-12-09 18:12:55.000000000 -0500
-@@ -18,26 +18,90 @@ typedef struct {
++++ linux-2.6.32.27/arch/x86/include/asm/local.h 2010-12-31 14:47:00.000000000 -0500
+@@ -18,26 +18,58 @@ typedef struct {
static inline void local_inc(local_t *l)
{
@@ -7866,18 +7793,10 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_INC "%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_DEC "%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
: "+m" (l->a.counter));
@@ -7889,18 +7808,10 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_DEC "%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_INC "%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
: "+m" (l->a.counter));
@@ -7912,18 +7823,10 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_ADD "%1,%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_SUB "%1,%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
: "+m" (l->a.counter)
@@ -7936,24 +7839,16 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_SUB "%1,%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_ADD "%1,%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
: "+m" (l->a.counter)
: "ir" (i));
}
-@@ -55,7 +119,24 @@ static inline int local_sub_and_test(lon
+@@ -55,7 +87,16 @@ static inline int local_sub_and_test(lon
{
unsigned char c;
@@ -7961,25 +7856,17 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_SUB "%2,%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_ADD "%2,%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ "sete %1\n"
: "+m" (l->a.counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -73,7 +154,24 @@ static inline int local_dec_and_test(loc
+@@ -73,7 +114,16 @@ static inline int local_dec_and_test(loc
{
unsigned char c;
@@ -7987,25 +7874,17 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_DEC "%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_INC "%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ "sete %1\n"
: "+m" (l->a.counter), "=qm" (c)
: : "memory");
return c != 0;
-@@ -91,7 +189,24 @@ static inline int local_inc_and_test(loc
+@@ -91,7 +141,16 @@ static inline int local_inc_and_test(loc
{
unsigned char c;
@@ -8013,25 +7892,17 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_INC "%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_DEC "%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ "sete %1\n"
: "+m" (l->a.counter), "=qm" (c)
: : "memory");
return c != 0;
-@@ -110,7 +225,24 @@ static inline int local_add_negative(lon
+@@ -110,7 +169,16 @@ static inline int local_add_negative(lon
{
unsigned char c;
@@ -8039,25 +7910,17 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_ADD "%2,%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_SUB "%2,%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ "sets %1\n"
: "+m" (l->a.counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -133,7 +265,23 @@ static inline long local_add_return(long
+@@ -133,7 +201,15 @@ static inline long local_add_return(long
#endif
/* Modern 486+ processor */
__i = i;
@@ -8065,18 +7928,10 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
+ asm volatile(_ASM_XADD "%0, %1\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ _ASM_MOV "%0,%1\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
: "+r" (i), "+m" (l->a.counter)
@@ -8084,7 +7939,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/local.h linux-2.6.32.27/arch/x86
return i + __i;
diff -urNp linux-2.6.32.27/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.27/arch/x86/include/asm/mc146818rtc.h
--- linux-2.6.32.27/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/mc146818rtc.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/mc146818rtc.h 2010-12-31 14:46:53.000000000 -0500
@@ -81,8 +81,8 @@ static inline unsigned char current_lock
#else
#define lock_cmos_prefix(reg) do {} while (0)
@@ -8098,7 +7953,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.27/ar
#endif
diff -urNp linux-2.6.32.27/arch/x86/include/asm/microcode.h linux-2.6.32.27/arch/x86/include/asm/microcode.h
--- linux-2.6.32.27/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/microcode.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/microcode.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
@@ -8141,7 +7996,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/microcode.h linux-2.6.32.27/arch
}
diff -urNp linux-2.6.32.27/arch/x86/include/asm/mman.h linux-2.6.32.27/arch/x86/include/asm/mman.h
--- linux-2.6.32.27/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/mman.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/mman.h 2010-12-31 14:46:53.000000000 -0500
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -8159,7 +8014,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/mman.h linux-2.6.32.27/arch/x86/
#endif /* _ASM_X86_MMAN_H */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/mmu_context.h linux-2.6.32.27/arch/x86/include/asm/mmu_context.h
--- linux-2.6.32.27/arch/x86/include/asm/mmu_context.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/mmu_context.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/mmu_context.h 2010-12-31 14:46:53.000000000 -0500
@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -8286,7 +8141,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/mmu_context.h linux-2.6.32.27/ar
#define activate_mm(prev, next) \
diff -urNp linux-2.6.32.27/arch/x86/include/asm/mmu.h linux-2.6.32.27/arch/x86/include/asm/mmu.h
--- linux-2.6.32.27/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/mmu.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/mmu.h 2010-12-31 14:46:53.000000000 -0500
@@ -9,10 +9,23 @@
* we put the segment information here.
*/
@@ -8315,7 +8170,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/mmu.h linux-2.6.32.27/arch/x86/i
#ifdef CONFIG_SMP
diff -urNp linux-2.6.32.27/arch/x86/include/asm/module.h linux-2.6.32.27/arch/x86/include/asm/module.h
--- linux-2.6.32.27/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/module.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/module.h 2010-12-31 14:46:53.000000000 -0500
@@ -59,13 +59,31 @@
#error unknown processor family
#endif
@@ -8351,7 +8206,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/module.h linux-2.6.32.27/arch/x8
#endif /* _ASM_X86_MODULE_H */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/page_32_types.h linux-2.6.32.27/arch/x86/include/asm/page_32_types.h
--- linux-2.6.32.27/arch/x86/include/asm/page_32_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/page_32_types.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/page_32_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -15,6 +15,10 @@
*/
#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -8365,7 +8220,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/page_32_types.h linux-2.6.32.27/
#else
diff -urNp linux-2.6.32.27/arch/x86/include/asm/page_64_types.h linux-2.6.32.27/arch/x86/include/asm/page_64_types.h
--- linux-2.6.32.27/arch/x86/include/asm/page_64_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/page_64_types.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/page_64_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
/* duplicated to the one in bootmem.h */
@@ -8377,7 +8232,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/page_64_types.h linux-2.6.32.27/
#define __phys_reloc_hide(x) (x)
diff -urNp linux-2.6.32.27/arch/x86/include/asm/paravirt.h linux-2.6.32.27/arch/x86/include/asm/paravirt.h
--- linux-2.6.32.27/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/paravirt.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/paravirt.h 2010-12-31 14:46:53.000000000 -0500
@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
@@ -8433,7 +8288,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/paravirt.h linux-2.6.32.27/arch/
#endif /* __ASSEMBLY__ */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/paravirt_types.h linux-2.6.32.27/arch/x86/include/asm/paravirt_types.h
--- linux-2.6.32.27/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/paravirt_types.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/paravirt_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -316,6 +316,12 @@ struct pv_mmu_ops {
an mfn. We can tell which is which from the index. */
void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -8449,7 +8304,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/paravirt_types.h linux-2.6.32.27
struct raw_spinlock;
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pci_x86.h linux-2.6.32.27/arch/x86/include/asm/pci_x86.h
--- linux-2.6.32.27/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pci_x86.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pci_x86.h 2010-12-31 14:46:53.000000000 -0500
@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
@@ -8474,7 +8329,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pci_x86.h linux-2.6.32.27/arch/x
/* arch_initcall level */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgalloc.h linux-2.6.32.27/arch/x86/include/asm/pgalloc.h
--- linux-2.6.32.27/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pgalloc.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgalloc.h 2010-12-31 14:46:53.000000000 -0500
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -8491,7 +8346,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgalloc.h linux-2.6.32.27/arch/x
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.27/arch/x86/include/asm/pgtable-2level.h
--- linux-2.6.32.27/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pgtable-2level.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgtable-2level.h 2010-12-31 14:46:53.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)
@@ -8504,7 +8359,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.27
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_32.h linux-2.6.32.27/arch/x86/include/asm/pgtable_32.h
--- linux-2.6.32.27/arch/x86/include/asm/pgtable_32.h 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/include/asm/pgtable_32.h 2010-12-09 18:55:05.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -26,9 +26,6 @@
struct mm_struct;
struct vm_area_struct;
@@ -8550,7 +8405,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_32.h linux-2.6.32.27/arc
* SPARSEMEM and DISCONTIGMEM
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.27/arch/x86/include/asm/pgtable_32_types.h
--- linux-2.6.32.27/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pgtable_32_types.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgtable_32_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
@@ -8582,7 +8437,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.27/arch/x86/include/asm/pgtable-3level.h
--- linux-2.6.32.27/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pgtable-3level.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgtable-3level.h 2010-12-31 14:46:53.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)
@@ -8602,7 +8457,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.27
/*
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_64.h linux-2.6.32.27/arch/x86/include/asm/pgtable_64.h
--- linux-2.6.32.27/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pgtable_64.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgtable_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
@@ -8641,7 +8496,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_64.h linux-2.6.32.27/arc
static inline void native_pgd_clear(pgd_t *pgd)
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.27/arch/x86/include/asm/pgtable_64_types.h
--- linux-2.6.32.27/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pgtable_64_types.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgtable_64_types.h 2010-12-31 14:46:53.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)
@@ -8655,7 +8510,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable.h linux-2.6.32.27/arch/x86/include/asm/pgtable.h
--- linux-2.6.32.27/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pgtable.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
#define arch_end_context_switch(prev) do {} while(0)
@@ -8827,7 +8682,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable.h linux-2.6.32.27/arch/x
#endif /* __ASSEMBLY__ */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_types.h linux-2.6.32.27/arch/x86/include/asm/pgtable_types.h
--- linux-2.6.32.27/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/pgtable_types.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/pgtable_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -16,12 +16,11 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8950,7 +8805,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/pgtable_types.h linux-2.6.32.27/
extern pgprot_t pgprot_writecombine(pgprot_t prot);
diff -urNp linux-2.6.32.27/arch/x86/include/asm/processor.h linux-2.6.32.27/arch/x86/include/asm/processor.h
--- linux-2.6.32.27/arch/x86/include/asm/processor.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/processor.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/processor.h 2010-12-31 14:46:53.000000000 -0500
@@ -272,7 +272,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -9037,7 +8892,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/processor.h linux-2.6.32.27/arch
/* Get/set a process' ability to use the timestamp counter instruction */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/ptrace.h linux-2.6.32.27/arch/x86/include/asm/ptrace.h
--- linux-2.6.32.27/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/ptrace.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/ptrace.h 2010-12-31 14:46:53.000000000 -0500
@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
}
@@ -9076,7 +8931,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/ptrace.h linux-2.6.32.27/arch/x8
diff -urNp linux-2.6.32.27/arch/x86/include/asm/reboot.h linux-2.6.32.27/arch/x86/include/asm/reboot.h
--- linux-2.6.32.27/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/reboot.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/reboot.h 2010-12-31 14:46:53.000000000 -0500
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -9088,193 +8943,98 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/reboot.h linux-2.6.32.27/arch/x8
void nmi_shootdown_cpus(nmi_shootdown_cb callback);
diff -urNp linux-2.6.32.27/arch/x86/include/asm/rwsem.h linux-2.6.32.27/arch/x86/include/asm/rwsem.h
--- linux-2.6.32.27/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/rwsem.h 2010-12-09 18:12:55.000000000 -0500
-@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
++++ linux-2.6.32.27/arch/x86/include/asm/rwsem.h 2010-12-31 14:47:01.000000000 -0500
+@@ -118,6 +118,14 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
LOCK_PREFIX _ASM_INC "(%1)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ LOCK_PREFIX _ASM_DEC "(%1)\n\t"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
/* adds 0x00000001, returns the old value */
-- " jns 1f\n"
-+ " jns 2f\n"
+ " jns 1f\n"
" call call_rwsem_down_read_failed\n"
-- "1:\n\t"
-+ "2:\n\t"
- "# ending down_read\n\t"
- : "+m" (sem->count)
- : "a" (sem)
-@@ -136,13 +152,29 @@ static inline int __down_read_trylock(st
- rwsem_count_t result, tmp;
- asm volatile("# beginning __down_read_trylock\n\t"
- " mov %0,%1\n\t"
-- "1:\n\t"
-+ "2:\n\t"
+@@ -139,6 +147,14 @@ static inline int __down_read_trylock(st
+ "1:\n\t"
" mov %1,%2\n\t"
" add %3,%2\n\t"
-- " jle 2f\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ "sub %3,%2\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
-+ " jle 3f\n\t"
+ " jle 2f\n\t"
LOCK_PREFIX " cmpxchg %2,%0\n\t"
-- " jnz 1b\n\t"
-- "2:\n\t"
-+ " jnz 2b\n\t"
-+ "3:\n\t"
- "# ending __down_read_trylock\n\t"
- : "+m" (sem->count), "=&a" (result), "=&r" (tmp)
- : "i" (RWSEM_ACTIVE_READ_BIAS)
-@@ -160,12 +192,28 @@ static inline void __down_write_nested(s
+ " jnz 1b\n\t"
+@@ -160,6 +176,14 @@ static inline void __down_write_nested(s
tmp = RWSEM_ACTIVE_WRITE_BIAS;
asm volatile("# beginning down_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ "mov %1,(%2)\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
/* subtract 0x0000ffff, returns the old value */
" test %1,%1\n\t"
/* was the count 0 before? */
-- " jz 1f\n"
-+ " jz 2f\n"
- " call call_rwsem_down_write_failed\n"
-- "1:\n"
-+ "2:\n"
- "# ending down_write"
- : "+m" (sem->count), "=d" (tmp)
- : "a" (sem), "1" (tmp)
-@@ -198,10 +246,26 @@ static inline void __up_read(struct rw_s
+@@ -198,6 +222,14 @@ static inline void __up_read(struct rw_s
rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
asm volatile("# beginning __up_read\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ "mov %1,(%2)\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
/* subtracts 1, returns the old value */
-- " jns 1f\n\t"
-+ " jns 2f\n\t"
+ " jns 1f\n\t"
" call call_rwsem_wake\n"
-- "1:\n"
-+ "2:\n"
- "# ending __up_read\n"
- : "+m" (sem->count), "=d" (tmp)
- : "a" (sem), "1" (tmp)
-@@ -216,11 +280,27 @@ static inline void __up_write(struct rw_
+@@ -216,6 +248,14 @@ static inline void __up_write(struct rw_
rwsem_count_t tmp;
asm volatile("# beginning __up_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ "mov %1,(%2)\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
/* tries to transition
0xffff0001 -> 0x00000000 */
-- " jz 1f\n"
-+ " jz 2f\n"
- " call call_rwsem_wake\n"
-- "1:\n\t"
-+ "2:\n\t"
- "# ending __up_write\n"
- : "+m" (sem->count), "=d" (tmp)
- : "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS)
-@@ -234,13 +314,29 @@ static inline void __downgrade_write(str
+ " jz 1f\n"
+@@ -234,6 +274,14 @@ static inline void __downgrade_write(str
{
asm volatile("# beginning __downgrade_write\n\t"
LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
/*
* transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
* 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
- */
-- " jns 1f\n\t"
-+ " jns 2f\n\t"
- " call call_rwsem_downgrade_wake\n"
-- "1:\n\t"
-+ "2:\n\t"
- "# ending __downgrade_write\n"
- : "+m" (sem->count)
- : "a" (sem), "er" (-RWSEM_WAITING_BIAS)
-@@ -253,7 +349,23 @@ static inline void __downgrade_write(str
+@@ -253,7 +301,15 @@ static inline void __downgrade_write(str
static inline void rwsem_atomic_add(rwsem_count_t delta,
struct rw_semaphore *sem)
{
@@ -9282,24 +9042,16 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/rwsem.h linux-2.6.32.27/arch/x86
+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
: "+m" (sem->count)
: "er" (delta));
}
-@@ -266,7 +378,23 @@ static inline rwsem_count_t rwsem_atomic
+@@ -266,7 +322,15 @@ static inline rwsem_count_t rwsem_atomic
{
rwsem_count_t tmp = delta;
@@ -9307,18 +9059,10 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/rwsem.h linux-2.6.32.27/arch/x86
+ asm volatile(LOCK_PREFIX "xadd %0,%1\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ "mov %0,%1\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
: "+r" (tmp), "+m" (sem->count)
@@ -9326,7 +9070,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/rwsem.h linux-2.6.32.27/arch/x86
diff -urNp linux-2.6.32.27/arch/x86/include/asm/segment.h linux-2.6.32.27/arch/x86/include/asm/segment.h
--- linux-2.6.32.27/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/segment.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/segment.h 2010-12-31 14:46:53.000000000 -0500
@@ -62,8 +62,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -9397,7 +9141,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/segment.h linux-2.6.32.27/arch/x
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
diff -urNp linux-2.6.32.27/arch/x86/include/asm/smp.h linux-2.6.32.27/arch/x86/include/asm/smp.h
--- linux-2.6.32.27/arch/x86/include/asm/smp.h 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/include/asm/smp.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/smp.h 2010-12-31 14:46:53.000000000 -0500
@@ -24,7 +24,7 @@ extern unsigned int num_processors;
DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -9409,63 +9153,38 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/smp.h linux-2.6.32.27/arch/x86/i
{
diff -urNp linux-2.6.32.27/arch/x86/include/asm/spinlock.h linux-2.6.32.27/arch/x86/include/asm/spinlock.h
--- linux-2.6.32.27/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/spinlock.h 2010-12-09 18:12:55.000000000 -0500
-@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
++++ linux-2.6.32.27/arch/x86/include/asm/spinlock.h 2010-12-31 14:47:01.000000000 -0500
+@@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
-- "jns 1f\n"
-- "call __read_lock_failed\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
- "1:\n"
+ LOCK_PREFIX " addl $1,(%0)\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
-+ "jns 2f\n"
-+ "call __read_lock_failed\n\t"
-+ "2:\n"
- ::LOCK_PTR_REG (rw) : "memory");
- }
-
+ "jns 1f\n"
+ "call __read_lock_failed\n\t"
+ "1:\n"
+@@ -258,6 +266,14 @@ static inline void __raw_read_lock(raw_r
static inline void __raw_write_lock(raw_rwlock_t *rw)
{
asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
-- "jz 1f\n"
-- "call __write_lock_failed\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
- "1:\n"
+ LOCK_PREFIX " addl %1,(%0)\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
-+ "jz 2f\n"
-+ "call __write_lock_failed\n\t"
-+ "2:\n"
- ::LOCK_PTR_REG (rw), "i" (RW_LOCK_BIAS) : "memory");
- }
-
-@@ -286,12 +318,45 @@ static inline int __raw_write_trylock(ra
+ "jz 1f\n"
+ "call __write_lock_failed\n\t"
+ "1:\n"
+@@ -286,12 +302,29 @@ static inline int __raw_write_trylock(ra
static inline void __raw_read_unlock(raw_rwlock_t *rw)
{
@@ -9473,18 +9192,10 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/spinlock.h linux-2.6.32.27/arch/
+ asm volatile(LOCK_PREFIX "incl %0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ LOCK_PREFIX "decl %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ :"+m" (rw->lock) : : "memory");
@@ -9496,26 +9207,30 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/spinlock.h linux-2.6.32.27/arch/
+ asm volatile(LOCK_PREFIX "addl %1, %0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+ "into\n0:\n"
-+#else
+ "jno 0f\n"
++ LOCK_PREFIX "subl %1, %0\n"
+ "int $4\n0:\n"
-+#endif
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
-+ LOCK_PREFIX "subl %1,%0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
}
+diff -urNp linux-2.6.32.27/arch/x86/include/asm/stackprotector.h linux-2.6.32.27/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.32.27/arch/x86/include/asm/stackprotector.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/arch/x86/include/asm/stackprotector.h 2010-12-31 14:47:01.000000000 -0500
+@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
+
+ static inline void load_stack_canary_segment(void)
+ {
+-#ifdef CONFIG_X86_32
++#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
+ asm volatile ("mov %0, %%gs" : : "r" (0));
+ #endif
+ }
diff -urNp linux-2.6.32.27/arch/x86/include/asm/system.h linux-2.6.32.27/arch/x86/include/asm/system.h
--- linux-2.6.32.27/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/system.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
@@ -9536,7 +9251,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/system.h linux-2.6.32.27/arch/x8
void default_idle(void);
diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_32.h linux-2.6.32.27/arch/x86/include/asm/uaccess_32.h
--- linux-2.6.32.27/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/uaccess_32.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9668,7 +9383,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_32.h linux-2.6.32.27/arc
long __must_check __strncpy_from_user(char *dst,
diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h
--- linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h 2010-12-31 14:47:01.000000000 -0500
@@ -9,6 +9,9 @@
#include <linux/prefetch.h>
#include <linux/lockdep.h>
@@ -9679,7 +9394,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
/*
* Copy To/From Userspace
-@@ -19,113 +22,162 @@ __must_check unsigned long
+@@ -19,113 +22,179 @@ __must_check unsigned long
copy_user_generic(void *to, const void *from, unsigned len);
__must_check unsigned long
@@ -9703,6 +9418,11 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
+ if ((int)size < 0)
+ return size;
+
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ if (!__access_ok(VERIFY_READ, src, size))
++ return size;
++#endif
++
+ if (!__builtin_constant_p(size)) {
+ check_object_size(dst, size, false);
+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
@@ -9769,6 +9489,11 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
+ if ((int)size < 0)
+ return size;
+
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ if (!__access_ok(VERIFY_WRITE, dst, size))
++ return size;
++#endif
++
+ if (!__builtin_constant_p(size)) {
+ check_object_size(src, size, true);
+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
@@ -9858,6 +9583,13 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
+ if ((int)size < 0)
+ return size;
+
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ if (!__access_ok(VERIFY_READ, src, size))
++ return size;
++ if (!__access_ok(VERIFY_WRITE, dst, size))
++ return size;
++#endif
++
+ if (!__builtin_constant_p(size)) {
+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
+ src += PAX_USER_SHADOW_BASE;
@@ -9875,7 +9607,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
ret, "b", "b", "=q", 1);
if (likely(!ret))
__put_user_asm(tmp, (u8 __user *)dst,
-@@ -134,7 +186,7 @@ int __copy_in_user(void __user *dst, con
+@@ -134,7 +203,7 @@ int __copy_in_user(void __user *dst, con
}
case 2: {
u16 tmp;
@@ -9884,7 +9616,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
ret, "w", "w", "=r", 2);
if (likely(!ret))
__put_user_asm(tmp, (u16 __user *)dst,
-@@ -144,7 +196,7 @@ int __copy_in_user(void __user *dst, con
+@@ -144,7 +213,7 @@ int __copy_in_user(void __user *dst, con
case 4: {
u32 tmp;
@@ -9893,7 +9625,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
ret, "l", "k", "=r", 4);
if (likely(!ret))
__put_user_asm(tmp, (u32 __user *)dst,
-@@ -153,7 +205,7 @@ int __copy_in_user(void __user *dst, con
+@@ -153,7 +222,7 @@ int __copy_in_user(void __user *dst, con
}
case 8: {
u64 tmp;
@@ -9902,7 +9634,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
ret, "q", "", "=r", 8);
if (likely(!ret))
__put_user_asm(tmp, (u64 __user *)dst,
-@@ -161,8 +213,12 @@ int __copy_in_user(void __user *dst, con
+@@ -161,8 +230,12 @@ int __copy_in_user(void __user *dst, con
return ret;
}
default:
@@ -9916,9 +9648,27 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
}
}
-@@ -179,30 +235,40 @@ __must_check unsigned long __clear_user(
- __must_check long __copy_from_user_inatomic(void *dst, const void __user *src,
- unsigned size);
+@@ -176,33 +249,71 @@ __must_check long strlen_user(const char
+ __must_check unsigned long clear_user(void __user *mem, unsigned long len);
+ __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
+
+-__must_check long __copy_from_user_inatomic(void *dst, const void __user *src,
+- unsigned size);
++static __must_check __always_inline unsigned long
++__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
++{
++ if ((int)size < 0)
++ return size;
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ if (!__access_ok(VERIFY_READ, src, size))
++ return size;
++#endif
++
++ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++ src += PAX_USER_SHADOW_BASE;
++ return copy_user_generic(dst, (__force const void *)src, size);
++}
-static __must_check __always_inline int
+static __must_check __always_inline unsigned long
@@ -9927,6 +9677,11 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
+ if ((int)size < 0)
+ return size;
+
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ if (!__access_ok(VERIFY_WRITE, dst, size))
++ return size;
++#endif
++
+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
+ dst += PAX_USER_SHADOW_BASE;
return copy_user_generic((__force void *)dst, src, size);
@@ -9945,6 +9700,11 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
+ if ((int)size < 0)
+ return size;
+
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ if (!__access_ok(VERIFY_READ, src, size))
++ return size;
++#endif
++
return __copy_user_nocache(dst, src, size, 1);
}
@@ -9956,6 +9716,11 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
+ if ((int)size < 0)
+ return size;
+
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ if (!__access_ok(VERIFY_READ, src, size))
++ return size;
++#endif
++
return __copy_user_nocache(dst, src, size, 0);
}
@@ -9966,7 +9731,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess_64.h linux-2.6.32.27/arc
#endif /* _ASM_X86_UACCESS_64_H */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess.h linux-2.6.32.27/arch/x86/include/asm/uaccess.h
--- linux-2.6.32.27/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/uaccess.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/uaccess.h 2010-12-31 14:47:01.000000000 -0500
@@ -8,12 +8,15 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -9987,8 +9752,8 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess.h linux-2.6.32.27/arch/x
#define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit)
-+#ifdef CONFIG_X86_32
-+void __set_fs(mm_segment_t x, int cpu);
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
++void __set_fs(mm_segment_t x);
+void set_fs(mm_segment_t x);
+#else
#define set_fs(x) (current_thread_info()->addr_limit = (x))
@@ -10031,92 +9796,69 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess.h linux-2.6.32.27/arch/x
/*
* The exception table consists of pairs of addresses: the first is the
-@@ -183,13 +217,21 @@ extern int __get_user_bad(void);
+@@ -183,12 +217,20 @@ extern int __get_user_bad(void);
asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
: "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
-
-+#ifdef CONFIG_X86_32
-+#define _ASM_LOAD_USER_DS(ds) "movw %w" #ds ",%%ds\n"
-+#define _ASM_LOAD_KERNEL_DS "pushl %%ss; popl %%ds\n"
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __copyuser_seg "%%gs:"
++#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
++#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
+#else
-+#define _ASM_LOAD_USER_DS(ds)
-+#define _ASM_LOAD_KERNEL_DS
++#define __copyuser_seg
++#define __COPYUSER_SET_ES
++#define __COPYUSER_RESTORE_ES
+#endif
#ifdef CONFIG_X86_32
#define __put_user_asm_u64(x, addr, err, errret) \
- asm volatile("1: movl %%eax,0(%2)\n" \
- "2: movl %%edx,4(%2)\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: movl %%eax,%%ds:0(%2)\n" \
-+ "2: movl %%edx,%%ds:4(%2)\n" \
++ asm volatile("1: movl %%eax," __copyuser_seg"0(%2)\n" \
++ "2: movl %%edx," __copyuser_seg"4(%2)\n" \
"3:\n" \
-+ _ASM_LOAD_KERNEL_DS \
".section .fixup,\"ax\"\n" \
"4: movl %3,%0\n" \
- " jmp 3b\n" \
-@@ -197,15 +239,18 @@ extern int __get_user_bad(void);
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
- : "=r" (err) \
-- : "A" (x), "r" (addr), "i" (errret), "0" (err))
-+ : "A" (x), "r" (addr), "i" (errret), "0" (err), \
-+ "r"(__USER_DS))
+@@ -200,8 +242,8 @@ extern int __get_user_bad(void);
+ : "A" (x), "r" (addr), "i" (errret), "0" (err))
#define __put_user_asm_ex_u64(x, addr) \
- asm volatile("1: movl %%eax,0(%1)\n" \
- "2: movl %%edx,4(%1)\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: movl %%eax,%%ds:0(%1)\n" \
-+ "2: movl %%edx,%%ds:4(%1)\n" \
++ asm volatile("1: movl %%eax," __copyuser_seg"0(%1)\n" \
++ "2: movl %%edx," __copyuser_seg"4(%1)\n" \
"3:\n" \
-+ _ASM_LOAD_KERNEL_DS \
_ASM_EXTABLE(1b, 2b - 1b) \
_ASM_EXTABLE(2b, 3b - 2b) \
-- : : "A" (x), "r" (addr))
-+ : : "A" (x), "r" (addr), "r"(__USER_DS))
-
- #define __put_user_x8(x, ptr, __ret_pu) \
- asm volatile("call __put_user_8" : "=a" (__ret_pu) \
-@@ -374,16 +419,18 @@ do { \
+@@ -374,7 +416,7 @@ do { \
} while (0)
#define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: mov"itype" %%ds:%2,%"rtype"1\n" \
++ asm volatile("1: mov"itype" "__copyuser_seg"%2,%"rtype"1\n"\
"2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
".section .fixup,\"ax\"\n" \
"3: mov %3,%0\n" \
- " xor"itype" %"rtype"1,%"rtype"1\n" \
+@@ -382,7 +424,7 @@ do { \
" jmp 2b\n" \
".previous\n" \
_ASM_EXTABLE(1b, 3b) \
- : "=r" (err), ltype(x) \
-- : "m" (__m(addr)), "i" (errret), "0" (err))
+ : "=r" (err), ltype (x) \
-+ : "m" (__m(addr)), "i" (errret), "0" (err), "r"(__USER_DS))
+ : "m" (__m(addr)), "i" (errret), "0" (err))
#define __get_user_size_ex(x, ptr, size) \
- do { \
-@@ -407,10 +454,12 @@ do { \
+@@ -407,7 +449,7 @@ do { \
} while (0)
#define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: mov"itype" %%ds:%1,%"rtype"0\n" \
++ asm volatile("1: mov"itype" "__copyuser_seg"%1,%"rtype"0\n"\
"2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
_ASM_EXTABLE(1b, 2b - 1b) \
-- : ltype(x) : "m" (__m(addr)))
-+ : ltype(x) : "m" (__m(addr)), "r"(__USER_DS))
-
- #define __put_user_nocheck(x, ptr, size) \
- ({ \
-@@ -424,13 +473,24 @@ do { \
+ : ltype(x) : "m" (__m(addr)))
+@@ -424,13 +466,24 @@ do { \
int __gu_err; \
unsigned long __gu_val; \
__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
@@ -10143,38 +9885,55 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess.h linux-2.6.32.27/arch/x
/*
* Tell gcc we read from memory instead of writing: this is because
-@@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu
+@@ -438,7 +491,7 @@ struct __large_struct { unsigned long bu
* aliasing issues.
*/
#define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: mov"itype" %"rtype"1,%%ds:%2\n" \
++ asm volatile("1: mov"itype" %"rtype"1," __copyuser_seg"%2\n"\
"2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
".section .fixup,\"ax\"\n" \
"3: mov %3,%0\n" \
- " jmp 2b\n" \
+@@ -446,10 +499,10 @@ struct __large_struct { unsigned long bu
".previous\n" \
_ASM_EXTABLE(1b, 3b) \
: "=r"(err) \
- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
-+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err),\
-+ "r"(__USER_DS))
++ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
#define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: mov"itype" %"rtype"0,%%ds:%1\n" \
++ asm volatile("1: mov"itype" %"rtype"0," __copyuser_seg"%1\n"\
"2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
_ASM_EXTABLE(1b, 2b - 1b) \
-- : : ltype(x), "m" (__m(addr)))
-+ : : ltype(x), "m" (__m(addr)), "r"(__USER_DS))
+ : : ltype(x), "m" (__m(addr)))
+@@ -488,8 +541,12 @@ struct __large_struct { unsigned long bu
+ * On error, the variable @x is set to zero.
+ */
- /*
- * uaccess_try and catch
-@@ -530,7 +595,7 @@ struct __large_struct { unsigned long bu
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __get_user(x, ptr) get_user((x), (ptr))
++#else
+ #define __get_user(x, ptr) \
+ __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
++#endif
+
+ /**
+ * __put_user: - Write a simple value into user space, with less checking.
+@@ -511,8 +568,12 @@ struct __large_struct { unsigned long bu
+ * Returns zero on success, or -EFAULT on error.
+ */
+
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __put_user(x, ptr) put_user((x), (ptr))
++#else
+ #define __put_user(x, ptr) \
+ __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
++#endif
+
+ #define __get_user_unaligned __get_user
+ #define __put_user_unaligned __put_user
+@@ -530,7 +591,7 @@ struct __large_struct { unsigned long bu
#define get_user_ex(x, ptr) do { \
unsigned long __gue_val; \
__get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
@@ -10183,7 +9942,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess.h linux-2.6.32.27/arch/x
} while (0)
#ifdef CONFIG_X86_WP_WORKS_OK
-@@ -567,6 +632,7 @@ extern struct movsl_mask {
+@@ -567,6 +628,7 @@ extern struct movsl_mask {
#define ARCH_HAS_NOCACHE_UACCESS 1
@@ -10193,7 +9952,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/uaccess.h linux-2.6.32.27/arch/x
#else
diff -urNp linux-2.6.32.27/arch/x86/include/asm/vgtod.h linux-2.6.32.27/arch/x86/include/asm/vgtod.h
--- linux-2.6.32.27/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/vgtod.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/vgtod.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
@@ -10204,7 +9963,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/vgtod.h linux-2.6.32.27/arch/x86
cycle_t mask;
diff -urNp linux-2.6.32.27/arch/x86/include/asm/vmi.h linux-2.6.32.27/arch/x86/include/asm/vmi.h
--- linux-2.6.32.27/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/vmi.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/vmi.h 2010-12-31 14:46:53.000000000 -0500
@@ -191,6 +191,7 @@ struct vrom_header {
u8 reserved[96]; /* Reserved for headers */
char vmi_init[8]; /* VMI_Init jump point */
@@ -10215,7 +9974,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/vmi.h linux-2.6.32.27/arch/x86/i
struct pnp_header {
diff -urNp linux-2.6.32.27/arch/x86/include/asm/vsyscall.h linux-2.6.32.27/arch/x86/include/asm/vsyscall.h
--- linux-2.6.32.27/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/vsyscall.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/vsyscall.h 2010-12-31 14:46:53.000000000 -0500
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
@@ -10248,7 +10007,7 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/vsyscall.h linux-2.6.32.27/arch/
#endif /* _ASM_X86_VSYSCALL_H */
diff -urNp linux-2.6.32.27/arch/x86/include/asm/xsave.h linux-2.6.32.27/arch/x86/include/asm/xsave.h
--- linux-2.6.32.27/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/include/asm/xsave.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/include/asm/xsave.h 2010-12-31 14:46:53.000000000 -0500
@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
static inline int xsave_user(struct xsave_struct __user *buf)
{
@@ -10276,7 +10035,16 @@ diff -urNp linux-2.6.32.27/arch/x86/include/asm/xsave.h linux-2.6.32.27/arch/x86
".section .fixup,\"ax\"\n"
diff -urNp linux-2.6.32.27/arch/x86/Kconfig linux-2.6.32.27/arch/x86/Kconfig
--- linux-2.6.32.27/arch/x86/Kconfig 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/Kconfig 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/Kconfig 2010-12-31 14:47:01.000000000 -0500
+@@ -223,7 +223,7 @@ config X86_TRAMPOLINE
+
+ config X86_32_LAZY_GS
+ def_bool y
+- depends on X86_32 && !CC_STACKPROTECTOR
++ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
+
+ config KTIME_SCALAR
+ def_bool X86_32
@@ -997,7 +997,7 @@ choice
config NOHIGHMEM
@@ -10313,7 +10081,15 @@ diff -urNp linux-2.6.32.27/arch/x86/Kconfig linux-2.6.32.27/arch/x86/Kconfig
---help---
This enables the kernel to use EFI runtime services that are
available (such as the EFI variable services).
-@@ -1506,6 +1506,7 @@ config KEXEC_JUMP
+@@ -1449,6 +1449,7 @@ config SECCOMP
+
+ config CC_STACKPROTECTOR
+ bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
++ depends on X86_64 || !PAX_MEMORY_UDEREF
+ ---help---
+ This option turns on the -fstack-protector GCC feature. This
+ feature puts, at the beginning of functions, a canary value on
+@@ -1506,6 +1507,7 @@ config KEXEC_JUMP
config PHYSICAL_START
hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
default "0x1000000"
@@ -10321,7 +10097,7 @@ diff -urNp linux-2.6.32.27/arch/x86/Kconfig linux-2.6.32.27/arch/x86/Kconfig
---help---
This gives the physical address where the kernel is loaded.
-@@ -1570,6 +1571,7 @@ config PHYSICAL_ALIGN
+@@ -1570,6 +1572,7 @@ config PHYSICAL_ALIGN
hex
prompt "Alignment value to which kernel should be aligned" if X86_32
default "0x1000000"
@@ -10329,7 +10105,7 @@ diff -urNp linux-2.6.32.27/arch/x86/Kconfig linux-2.6.32.27/arch/x86/Kconfig
range 0x2000 0x1000000
---help---
This value puts the alignment restrictions on physical address
-@@ -1601,9 +1603,10 @@ config HOTPLUG_CPU
+@@ -1601,9 +1604,10 @@ config HOTPLUG_CPU
Say N if you want to disable CPU hotplug.
config COMPAT_VDSO
@@ -10343,7 +10119,7 @@ diff -urNp linux-2.6.32.27/arch/x86/Kconfig linux-2.6.32.27/arch/x86/Kconfig
---help---
diff -urNp linux-2.6.32.27/arch/x86/Kconfig.cpu linux-2.6.32.27/arch/x86/Kconfig.cpu
--- linux-2.6.32.27/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/Kconfig.cpu 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/Kconfig.cpu 2010-12-31 14:46:53.000000000 -0500
@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -10373,7 +10149,7 @@ diff -urNp linux-2.6.32.27/arch/x86/Kconfig.cpu linux-2.6.32.27/arch/x86/Kconfig
int
diff -urNp linux-2.6.32.27/arch/x86/Kconfig.debug linux-2.6.32.27/arch/x86/Kconfig.debug
--- linux-2.6.32.27/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/Kconfig.debug 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
@@ -99,7 +99,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
@@ -10385,7 +10161,7 @@ diff -urNp linux-2.6.32.27/arch/x86/Kconfig.debug linux-2.6.32.27/arch/x86/Kconf
in order to catch accidental (and incorrect) writes to such const
diff -urNp linux-2.6.32.27/arch/x86/kernel/acpi/boot.c linux-2.6.32.27/arch/x86/kernel/acpi/boot.c
--- linux-2.6.32.27/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/acpi/boot.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/acpi/boot.c 2010-12-31 14:46:53.000000000 -0500
@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
@@ -10397,7 +10173,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/acpi/boot.c linux-2.6.32.27/arch/x86/
/*
diff -urNp linux-2.6.32.27/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.27/arch/x86/kernel/acpi/realmode/wakeup.S
--- linux-2.6.32.27/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/acpi/realmode/wakeup.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/acpi/realmode/wakeup.S 2010-12-31 14:46:53.000000000 -0500
@@ -104,7 +104,7 @@ _start:
movl %eax, %ecx
orl %edx, %ecx
@@ -10409,7 +10185,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.2
diff -urNp linux-2.6.32.27/arch/x86/kernel/acpi/sleep.c linux-2.6.32.27/arch/x86/kernel/acpi/sleep.c
--- linux-2.6.32.27/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/acpi/sleep.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
@@ -11,11 +11,12 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
@@ -10456,7 +10232,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/acpi/sleep.c linux-2.6.32.27/arch/x86
diff -urNp linux-2.6.32.27/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.27/arch/x86/kernel/acpi/wakeup_32.S
--- linux-2.6.32.27/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/acpi/wakeup_32.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/acpi/wakeup_32.S 2010-12-31 14:46:53.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
@@ -10475,7 +10251,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.27/arch
jmp bogus_magic
diff -urNp linux-2.6.32.27/arch/x86/kernel/alternative.c linux-2.6.32.27/arch/x86/kernel/alternative.c
--- linux-2.6.32.27/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/alternative.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/alternative.c 2010-12-31 14:46:53.000000000 -0500
@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
BUG_ON(p->len > MAX_PATCH_LEN);
@@ -10560,7 +10336,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/alternative.c linux-2.6.32.27/arch/x8
}
diff -urNp linux-2.6.32.27/arch/x86/kernel/amd_iommu.c linux-2.6.32.27/arch/x86/kernel/amd_iommu.c
--- linux-2.6.32.27/arch/x86/kernel/amd_iommu.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/amd_iommu.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/amd_iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(
}
}
@@ -10572,7 +10348,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/amd_iommu.c linux-2.6.32.27/arch/x86/
.map_page = map_page,
diff -urNp linux-2.6.32.27/arch/x86/kernel/apic/io_apic.c linux-2.6.32.27/arch/x86/kernel/apic/io_apic.c
--- linux-2.6.32.27/arch/x86/kernel/apic/io_apic.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kernel/apic/io_apic.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/apic/io_apic.c 2010-12-31 14:46:53.000000000 -0500
@@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
@@ -10611,7 +10387,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/apic/io_apic.c linux-2.6.32.27/arch/x
}
diff -urNp linux-2.6.32.27/arch/x86/kernel/apm_32.c linux-2.6.32.27/arch/x86/kernel/apm_32.c
--- linux-2.6.32.27/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/apm_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/apm_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
@@ -10715,7 +10491,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/apm_32.c linux-2.6.32.27/arch/x86/ker
diff -urNp linux-2.6.32.27/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.27/arch/x86/kernel/asm-offsets_32.c
--- linux-2.6.32.27/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/asm-offsets_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/asm-offsets_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -115,6 +115,11 @@ void foo(void)
OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -10730,7 +10506,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.27/arch
#ifdef CONFIG_XEN
diff -urNp linux-2.6.32.27/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.27/arch/x86/kernel/asm-offsets_64.c
--- linux-2.6.32.27/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/asm-offsets_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/asm-offsets_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,6 +63,18 @@ int main(void)
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -10760,7 +10536,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.27/arch
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/common.c linux-2.6.32.27/arch/x86/kernel/cpu/common.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/common.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/common.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/common.c 2010-12-31 14:47:01.000000000 -0500
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10842,6 +10618,15 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/common.c linux-2.6.32.27/arch/x86
/* If the model name is still unset, do table lookup. */
if (!c->x86_model_id[0]) {
const char *p;
+@@ -1060,7 +1010,7 @@ struct pt_regs * __cpuinit idle_regs(str
+ {
+ memset(regs, 0, sizeof(struct pt_regs));
+ regs->fs = __KERNEL_PERCPU;
+- regs->gs = __KERNEL_STACK_CANARY;
++ savesegment(gs, regs->gs);
+
+ return regs;
+ }
@@ -1101,7 +1051,7 @@ void __cpuinit cpu_init(void)
int i;
@@ -10879,7 +10664,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/common.c linux-2.6.32.27/arch/x86
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-09 18:30:30.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-31 14:46:53.000000000 -0500
@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
@@ -10891,7 +10676,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-12-31 14:46:53.000000000 -0500
@@ -225,7 +225,7 @@ static struct cpu_model models[] =
{ &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
{ &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -10903,7 +10688,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
#undef BANIAS
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/intel.c linux-2.6.32.27/arch/x86/kernel/cpu/intel.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/intel.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/intel.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/intel.c 2010-12-31 14:46:53.000000000 -0500
@@ -162,7 +162,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.
@@ -10915,7 +10700,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/intel.c linux-2.6.32.27/arch/x86/
#endif
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.27/arch/x86/kernel/cpu/intel_cacheinfo.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -10927,7 +10712,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.27
};
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/Makefile linux-2.6.32.27/arch/x86/kernel/cpu/Makefile
--- linux-2.6.32.27/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/Makefile 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_common.o = -pg
endif
@@ -10941,7 +10726,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/Makefile linux-2.6.32.27/arch/x86
obj-y += vmware.o hypervisor.o sched.o
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce_amd.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-12-31 14:46:53.000000000 -0500
@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -10953,7 +10738,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.27/
};
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce.c 2010-12-31 14:46:53.000000000 -0500
@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
@@ -11008,7 +10793,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.27/arch
/*
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/amd.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/amd.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/amd.c 2010-12-31 14:46:53.000000000 -0500
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
return 0;
}
@@ -11020,7 +10805,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.27/arch/x
.get = amd_get_mtrr,
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/centaur.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/centaur.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/centaur.c 2010-12-31 14:46:53.000000000 -0500
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
return 0;
}
@@ -11032,7 +10817,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.27/ar
.get = centaur_get_mcr,
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/cyrix.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-12-31 14:46:53.000000000 -0500
@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
post_set();
}
@@ -11044,7 +10829,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.27/arch
.set = cyrix_set_arr,
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/generic.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/generic.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/generic.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
{ MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
{ MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -11065,7 +10850,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.27/ar
.get = generic_get_mtrr,
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/main.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/main.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/main.c 2010-12-31 14:46:53.000000000 -0500
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -11086,7 +10871,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.27/arch/
mtrr_ops[ops->vendor] = ops;
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/mtrr.h
--- linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,19 +12,19 @@
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
@@ -11139,7 +10924,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.27/arch/
#define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.27/arch/x86/kernel/cpu/perfctr-watchdog.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
@@ -11175,7 +10960,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.2
.unreserve = single_msr_unreserve,
diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.27/arch/x86/kernel/cpu/perf_event.c
--- linux-2.6.32.27/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/cpu/perf_event.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/cpu/perf_event.c 2010-12-31 14:46:53.000000000 -0500
@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
break;
@@ -11187,7 +10972,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.27/arch
diff -urNp linux-2.6.32.27/arch/x86/kernel/crash.c linux-2.6.32.27/arch/x86/kernel/crash.c
--- linux-2.6.32.27/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/crash.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/crash.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
@@ -11199,7 +10984,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/crash.c linux-2.6.32.27/arch/x86/kern
}
diff -urNp linux-2.6.32.27/arch/x86/kernel/doublefault_32.c linux-2.6.32.27/arch/x86/kernel/doublefault_32.c
--- linux-2.6.32.27/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/doublefault_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/doublefault_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -11233,7 +11018,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/doublefault_32.c linux-2.6.32.27/arch
.__cr3 = __pa_nodebug(swapper_pg_dir),
diff -urNp linux-2.6.32.27/arch/x86/kernel/dumpstack_32.c linux-2.6.32.27/arch/x86/kernel/dumpstack_32.c
--- linux-2.6.32.27/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/dumpstack_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/dumpstack_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
* When in-kernel, we also print out the stack and code at the
* time of the fault..
@@ -11280,8 +11065,18 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/dumpstack_32.c linux-2.6.32.27/arch/x
if (probe_kernel_address((unsigned short *)ip, ud2))
diff -urNp linux-2.6.32.27/arch/x86/kernel/dumpstack.c linux-2.6.32.27/arch/x86/kernel/dumpstack.c
--- linux-2.6.32.27/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/dumpstack.c 2010-12-09 18:12:55.000000000 -0500
-@@ -28,7 +28,7 @@ static int die_counter;
++++ linux-2.6.32.27/arch/x86/kernel/dumpstack.c 2010-12-31 14:52:58.000000000 -0500
+@@ -2,6 +2,9 @@
+ * Copyright (C) 1991, 1992 Linus Torvalds
+ * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
+ */
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++#define __INCLUDED_BY_HIDESYM 1
++#endif
+ #include <linux/kallsyms.h>
+ #include <linux/kprobes.h>
+ #include <linux/uaccess.h>
+@@ -28,7 +31,7 @@ static int die_counter;
void printk_address(unsigned long address, int reliable)
{
@@ -11290,7 +11085,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/dumpstack.c linux-2.6.32.27/arch/x86/
reliable ? "" : "? ", (void *) address);
}
-@@ -180,7 +180,7 @@ void dump_stack(void)
+@@ -180,7 +183,7 @@ void dump_stack(void)
#endif
printk("Pid: %d, comm: %.20s %s %s %.*s\n",
@@ -11299,7 +11094,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/dumpstack.c linux-2.6.32.27/arch/x86/
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version);
-@@ -241,7 +241,7 @@ void __kprobes oops_end(unsigned long fl
+@@ -241,7 +244,7 @@ void __kprobes oops_end(unsigned long fl
panic("Fatal exception in interrupt");
if (panic_on_oops)
panic("Fatal exception");
@@ -11308,7 +11103,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/dumpstack.c linux-2.6.32.27/arch/x86/
}
int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -295,7 +295,7 @@ void die(const char *str, struct pt_regs
+@@ -295,7 +298,7 @@ void die(const char *str, struct pt_regs
unsigned long flags = oops_begin();
int sig = SIGSEGV;
@@ -11319,7 +11114,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/dumpstack.c linux-2.6.32.27/arch/x86/
if (__die(str, regs, err))
diff -urNp linux-2.6.32.27/arch/x86/kernel/e820.c linux-2.6.32.27/arch/x86/kernel/e820.c
--- linux-2.6.32.27/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/e820.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/e820.c 2010-12-31 14:46:53.000000000 -0500
@@ -733,7 +733,7 @@ struct early_res {
};
static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -11331,7 +11126,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/e820.c linux-2.6.32.27/arch/x86/kerne
static int __init find_overlapped_early(u64 start, u64 end)
diff -urNp linux-2.6.32.27/arch/x86/kernel/efi_32.c linux-2.6.32.27/arch/x86/kernel/efi_32.c
--- linux-2.6.32.27/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/efi_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/efi_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -38,70 +38,38 @@
*/
@@ -11414,7 +11209,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/efi_32.c linux-2.6.32.27/arch/x86/ker
* After the lock is released, the original page table is restored.
diff -urNp linux-2.6.32.27/arch/x86/kernel/efi_stub_32.S linux-2.6.32.27/arch/x86/kernel/efi_stub_32.S
--- linux-2.6.32.27/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/efi_stub_32.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/efi_stub_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -6,6 +6,7 @@
*/
@@ -11515,8 +11310,22 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/efi_stub_32.S linux-2.6.32.27/arch/x8
efi_rt_function_ptr:
diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/kernel/entry_32.S
--- linux-2.6.32.27/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/entry_32.S 2010-12-09 18:12:55.000000000 -0500
-@@ -191,7 +191,67 @@
++++ linux-2.6.32.27/arch/x86/kernel/entry_32.S 2010-12-31 14:47:01.000000000 -0500
+@@ -185,13 +185,81 @@
+ /*CFI_REL_OFFSET gs, PT_GS*/
+ .endm
+ .macro SET_KERNEL_GS reg
++
++#ifdef CONFIG_CC_STACKPROTECTOR
+ movl $(__KERNEL_STACK_CANARY), \reg
++#elif defined(CONFIG_PAX_MEMORY_UDEREF)
++ movl $(__USER_DS), \reg
++#else
++ xorl \reg, \reg
++#endif
++
+ movl \reg, %gs
+ .endm
#endif /* CONFIG_X86_32_LAZY_GS */
@@ -11524,7 +11333,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
+.macro PAX_EXIT_KERNEL
+#ifdef CONFIG_PAX_KERNEXEC
+#ifdef CONFIG_PARAVIRT
-+ push %eax; push %ecx;
++ push %eax; push %ecx
+#endif
+ mov %cs, %esi
+ cmp $__KERNEXEC_KERNEL_CS, %esi
@@ -11554,7 +11363,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
+.macro PAX_ENTER_KERNEL
+#ifdef CONFIG_PAX_KERNEXEC
+#ifdef CONFIG_PARAVIRT
-+ push %eax; push %ecx;
++ push %eax; push %ecx
+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
+ mov %eax, %esi
+#else
@@ -11585,7 +11394,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
cld
PUSH_GS
pushl %fs
-@@ -224,7 +284,7 @@
+@@ -224,7 +292,7 @@
pushl %ebx
CFI_ADJUST_CFA_OFFSET 4
CFI_REL_OFFSET ebx, 0
@@ -11594,7 +11403,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
movl %edx, %ds
movl %edx, %es
movl $(__KERNEL_PERCPU), %edx
-@@ -232,6 +292,15 @@
+@@ -232,6 +300,15 @@
SET_KERNEL_GS %edx
.endm
@@ -11610,7 +11419,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
.macro RESTORE_INT_REGS
popl %ebx
CFI_ADJUST_CFA_OFFSET -4
-@@ -352,7 +421,15 @@ check_userspace:
+@@ -352,7 +429,15 @@ check_userspace:
movb PT_CS(%esp), %al
andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
cmpl $USER_RPL, %eax
@@ -11626,7 +11435,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
ENTRY(resume_userspace)
LOCKDEP_SYS_EXIT
-@@ -414,10 +491,9 @@ sysenter_past_esp:
+@@ -414,10 +499,9 @@ sysenter_past_esp:
/*CFI_REL_OFFSET cs, 0*/
/*
* Push current_thread_info()->sysenter_return to the stack.
@@ -11639,7 +11448,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
CFI_ADJUST_CFA_OFFSET 4
CFI_REL_OFFSET eip, 0
-@@ -430,9 +506,19 @@ sysenter_past_esp:
+@@ -430,9 +514,19 @@ sysenter_past_esp:
* Load the potential sixth argument from user stack.
* Careful about security.
*/
@@ -11659,7 +11468,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
movl %ebp,PT_EBP(%esp)
.section __ex_table,"a"
.align 4
-@@ -455,12 +541,23 @@ sysenter_do_call:
+@@ -455,12 +549,23 @@ sysenter_do_call:
testl $_TIF_ALLWORK_MASK, %ecx
jne sysexit_audit
sysenter_exit:
@@ -11683,7 +11492,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
PTGS_TO_GS
ENABLE_INTERRUPTS_SYSEXIT
-@@ -504,11 +601,17 @@ sysexit_audit:
+@@ -504,11 +609,17 @@ sysexit_audit:
CFI_ENDPROC
.pushsection .fixup,"ax"
@@ -11703,7 +11512,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
.popsection
PTGS_TO_GS_EX
ENDPROC(ia32_sysenter_target)
-@@ -538,6 +641,10 @@ syscall_exit:
+@@ -538,6 +649,10 @@ syscall_exit:
testl $_TIF_ALLWORK_MASK, %ecx # current->work
jne syscall_exit_work
@@ -11714,7 +11523,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
restore_all:
TRACE_IRQS_IRET
restore_all_notrace:
-@@ -602,7 +709,13 @@ ldt_ss:
+@@ -602,7 +717,13 @@ ldt_ss:
mov PT_OLDESP(%esp), %eax /* load userspace esp */
mov %dx, %ax /* eax: new kernel esp */
sub %eax, %edx /* offset (low word is 0) */
@@ -11729,7 +11538,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
shr $16, %edx
mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
-@@ -642,25 +755,19 @@ work_resched:
+@@ -642,25 +763,19 @@ work_resched:
work_notifysig: # deal with pending signals and
# notify-resume requests
@@ -11758,7 +11567,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
#endif
xorl %edx, %edx
call do_notify_resume
-@@ -695,6 +802,10 @@ END(syscall_exit_work)
+@@ -695,6 +810,10 @@ END(syscall_exit_work)
RING0_INT_FRAME # can't unwind into user space anyway
syscall_fault:
@@ -11769,7 +11578,39 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
GET_THREAD_INFO(%ebp)
movl $-EFAULT,PT_EAX(%esp)
jmp resume_userspace
-@@ -735,7 +846,13 @@ PTREGSCALL(vm86old)
+@@ -726,6 +845,31 @@ PTREGSCALL(rt_sigreturn)
+ PTREGSCALL(vm86)
+ PTREGSCALL(vm86old)
+
++ ALIGN;
++ENTRY(kernel_execve)
++ push %ebp
++ sub $PT_OLDSS+4,%esp
++ push %edi
++ push %ecx
++ push %eax
++ lea 3*4(%esp),%edi
++ mov $PT_OLDSS/4+1,%ecx
++ xorl %eax,%eax
++ rep stosl
++ pop %eax
++ pop %ecx
++ pop %edi
++ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
++ push %esp
++ call sys_execve
++ add $4,%esp
++ GET_THREAD_INFO(%ebp)
++ test %eax,%eax
++ jz syscall_exit
++ add $PT_OLDSS+4,%esp
++ pop %ebp
++ ret
++
+ .macro FIXUP_ESPFIX_STACK
+ /*
+ * Switch back for ESPFIX stack to the normal zerobased stack
+@@ -735,7 +879,13 @@ PTREGSCALL(vm86old)
* normal stack and adjusts ESP with the matching offset.
*/
/* fixup the stack */
@@ -11784,7 +11625,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
shl $16, %eax
-@@ -1198,7 +1315,6 @@ return_to_handler:
+@@ -1198,7 +1348,6 @@ return_to_handler:
ret
#endif
@@ -11792,7 +11633,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
#include "syscall_table_32.S"
syscall_table_size=(.-sys_call_table)
-@@ -1255,9 +1371,12 @@ error_code:
+@@ -1255,9 +1404,12 @@ error_code:
movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
REG_TO_PTGS %ecx
SET_KERNEL_GS %ecx
@@ -11806,7 +11647,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
TRACE_IRQS_OFF
movl %esp,%eax # pt_regs pointer
call *%edi
-@@ -1351,6 +1470,9 @@ nmi_stack_correct:
+@@ -1351,6 +1503,9 @@ nmi_stack_correct:
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
call do_nmi
@@ -11816,7 +11657,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
jmp restore_all_notrace
CFI_ENDPROC
-@@ -1391,6 +1513,9 @@ nmi_espfix_stack:
+@@ -1391,6 +1546,9 @@ nmi_espfix_stack:
FIXUP_ESPFIX_STACK # %eax == %esp
xorl %edx,%edx # zero error code
call do_nmi
@@ -11828,7 +11669,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_32.S linux-2.6.32.27/arch/x86/k
CFI_ADJUST_CFA_OFFSET -24
diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_64.S linux-2.6.32.27/arch/x86/kernel/entry_64.S
--- linux-2.6.32.27/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/entry_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/entry_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -12288,7 +12129,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/entry_64.S linux-2.6.32.27/arch/x86/k
nmi_userspace:
diff -urNp linux-2.6.32.27/arch/x86/kernel/ftrace.c linux-2.6.32.27/arch/x86/kernel/ftrace.c
--- linux-2.6.32.27/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/ftrace.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/ftrace.c 2010-12-31 14:46:53.000000000 -0500
@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
{
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -12356,7 +12197,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/ftrace.c linux-2.6.32.27/arch/x86/ker
diff -urNp linux-2.6.32.27/arch/x86/kernel/head32.c linux-2.6.32.27/arch/x86/kernel/head32.c
--- linux-2.6.32.27/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/head32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/head32.c 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
@@ -12376,7 +12217,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head32.c linux-2.6.32.27/arch/x86/ker
/* Reserve INITRD */
diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/kernel/head_32.S
--- linux-2.6.32.27/arch/x86/kernel/head_32.S 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kernel/head_32.S 2010-12-12 15:55:11.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/head_32.S 2010-12-31 14:47:01.000000000 -0500
@@ -19,10 +19,17 @@
#include <asm/setup.h>
#include <asm/processor-flags.h>
@@ -12435,7 +12276,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
ENTRY(startup_32)
/* test KEEP_SEGMENTS flag to see if the bootloader is asking
us to not reload segments */
-@@ -97,6 +113,55 @@ ENTRY(startup_32)
+@@ -97,6 +113,57 @@ ENTRY(startup_32)
movl %eax,%gs
2:
@@ -12456,6 +12297,8 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
+ movl $pa(cpu_gdt_table),%edi
+1:
+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
++ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
++ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
+ addl $PAGE_SIZE_asm,%edi
+ loop 1b
+#endif
@@ -12491,7 +12334,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
/*
* Clear BSS first so that there are no surprises...
*/
-@@ -140,9 +205,7 @@ ENTRY(startup_32)
+@@ -140,9 +207,7 @@ ENTRY(startup_32)
cmpl $num_subarch_entries, %eax
jae bad_subarch
@@ -12502,7 +12345,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
bad_subarch:
WEAK(lguest_entry)
-@@ -154,10 +217,10 @@ WEAK(xen_entry)
+@@ -154,10 +219,10 @@ WEAK(xen_entry)
__INITDATA
subarch_entries:
@@ -12517,7 +12360,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
num_subarch_entries = (. - subarch_entries) / 4
.previous
#endif /* CONFIG_PARAVIRT */
-@@ -218,8 +281,11 @@ default_entry:
+@@ -218,8 +283,11 @@ default_entry:
movl %eax, pa(max_pfn_mapped)
/* Do early initialization of the fixmap area */
@@ -12531,7 +12374,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
#else /* Not PAE */
page_pde_offset = (__PAGE_OFFSET >> 20);
-@@ -249,8 +315,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
+@@ -249,8 +317,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
movl %eax, pa(max_pfn_mapped)
/* Do early initialization of the fixmap area */
@@ -12545,7 +12388,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
#endif
jmp 3f
/*
-@@ -297,6 +366,7 @@ ENTRY(startup_32_smp)
+@@ -297,6 +368,7 @@ ENTRY(startup_32_smp)
orl %edx,%eax
movl %eax,%cr4
@@ -12553,7 +12396,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
btl $5, %eax # check if PAE is enabled
jnc 6f
-@@ -312,13 +382,17 @@ ENTRY(startup_32_smp)
+@@ -312,13 +384,17 @@ ENTRY(startup_32_smp)
jnc 6f
/* Setup EFER (Extended Feature Enable Register) */
@@ -12572,7 +12415,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
6:
/*
-@@ -344,9 +418,7 @@ ENTRY(startup_32_smp)
+@@ -344,9 +420,7 @@ ENTRY(startup_32_smp)
#ifdef CONFIG_SMP
cmpb $0, ready
@@ -12583,7 +12426,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
#endif /* CONFIG_SMP */
/*
-@@ -424,7 +496,7 @@ is386: movl $2,%ecx # set MP
+@@ -424,7 +498,7 @@ is386: movl $2,%ecx # set MP
1: movl $(__KERNEL_DS),%eax # reload all the segment registers
movl %eax,%ss # after changing gdt.
@@ -12592,7 +12435,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
movl %eax,%ds
movl %eax,%es
-@@ -438,8 +510,11 @@ is386: movl $2,%ecx # set MP
+@@ -438,15 +512,22 @@ is386: movl $2,%ecx # set MP
*/
cmpb $0,ready
jne 1f
@@ -12605,7 +12448,19 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
shrl $16, %ecx
movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -457,10 +532,6 @@ is386: movl $2,%ecx # set MP
+ movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
+ 1:
+-#endif
+ movl $(__KERNEL_STACK_CANARY),%eax
++#elif defined(CONFIG_PAX_MEMORY_UDEREF)
++ movl $(__USER_DS),%eax
++#else
++ xorl %eax,%eax
++#endif
+ movl %eax,%gs
+
+ xorl %eax,%eax # Clear LDT
+@@ -457,10 +538,6 @@ is386: movl $2,%ecx # set MP
#ifdef CONFIG_SMP
movb ready, %cl
movb $1, ready
@@ -12616,7 +12471,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
#endif /* CONFIG_SMP */
jmp *(initial_code)
-@@ -546,22 +617,22 @@ early_page_fault:
+@@ -546,22 +623,22 @@ early_page_fault:
jmp early_fault
early_fault:
@@ -12644,7 +12499,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
hlt_loop:
hlt
jmp hlt_loop
-@@ -569,8 +640,11 @@ hlt_loop:
+@@ -569,8 +646,11 @@ hlt_loop:
/* This is the default interrupt "handler" :-) */
ALIGN
ignore_int:
@@ -12657,7 +12512,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
pushl %eax
pushl %ecx
pushl %edx
-@@ -579,9 +653,6 @@ ignore_int:
+@@ -579,9 +659,6 @@ ignore_int:
movl $(__KERNEL_DS),%eax
movl %eax,%ds
movl %eax,%es
@@ -12667,7 +12522,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
pushl 16(%esp)
pushl 24(%esp)
pushl 32(%esp)
-@@ -610,31 +681,47 @@ ENTRY(initial_page_table)
+@@ -610,31 +687,47 @@ ENTRY(initial_page_table)
/*
* BSS section
*/
@@ -12720,7 +12575,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
ENTRY(swapper_pg_dir)
.long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
# if KPMDS == 3
-@@ -653,15 +740,24 @@ ENTRY(swapper_pg_dir)
+@@ -653,15 +746,24 @@ ENTRY(swapper_pg_dir)
# error "Kernel PMDs should be 1, 2 or 3"
# endif
.align PAGE_SIZE_asm /* needs to be page-sized too */
@@ -12746,7 +12601,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
early_recursion_flag:
.long 0
-@@ -697,7 +793,7 @@ fault_msg:
+@@ -697,7 +799,7 @@ fault_msg:
.word 0 # 32 bit align gdt_desc.address
boot_gdt_descr:
.word __BOOT_DS+7
@@ -12755,7 +12610,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
.word 0 # 32-bit align idt_desc.address
idt_descr:
-@@ -708,7 +804,7 @@ idt_descr:
+@@ -708,7 +810,7 @@ idt_descr:
.word 0 # 32 bit align gdt_desc.address
ENTRY(early_gdt_descr)
.word GDT_ENTRIES*8-1
@@ -12764,7 +12619,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
/*
* The boot_gdt must mirror the equivalent in setup.S and is
-@@ -717,5 +813,65 @@ ENTRY(early_gdt_descr)
+@@ -717,5 +819,65 @@ ENTRY(early_gdt_descr)
.align L1_CACHE_BYTES
ENTRY(boot_gdt)
.fill GDT_ENTRY_BOOT_CS,8,0
@@ -12834,7 +12689,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_32.S linux-2.6.32.27/arch/x86/ke
+ .endr
diff -urNp linux-2.6.32.27/arch/x86/kernel/head_64.S linux-2.6.32.27/arch/x86/kernel/head_64.S
--- linux-2.6.32.27/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/head_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/head_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -13107,7 +12962,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/head_64.S linux-2.6.32.27/arch/x86/ke
.align PAGE_SIZE
diff -urNp linux-2.6.32.27/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.27/arch/x86/kernel/i386_ksyms_32.c
--- linux-2.6.32.27/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/i386_ksyms_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/i386_ksyms_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -13131,7 +12986,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.27/arch/
+#endif
diff -urNp linux-2.6.32.27/arch/x86/kernel/init_task.c linux-2.6.32.27/arch/x86/kernel/init_task.c
--- linux-2.6.32.27/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/init_task.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/init_task.c 2010-12-31 14:46:53.000000000 -0500
@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
* section. Since TSS's are completely CPU-local, we want them
* on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -13142,7 +12997,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/init_task.c linux-2.6.32.27/arch/x86/
+EXPORT_SYMBOL(init_tss);
diff -urNp linux-2.6.32.27/arch/x86/kernel/ioport.c linux-2.6.32.27/arch/x86/kernel/ioport.c
--- linux-2.6.32.27/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/ioport.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -13188,7 +13043,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/ioport.c linux-2.6.32.27/arch/x86/ker
}
diff -urNp linux-2.6.32.27/arch/x86/kernel/irq_32.c linux-2.6.32.27/arch/x86/kernel/irq_32.c
--- linux-2.6.32.27/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/irq_32.c 2010-12-10 17:10:02.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/irq_32.c 2010-12-31 14:58:57.000000000 -0500
@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
return 0;
@@ -13203,7 +13058,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/irq_32.c linux-2.6.32.27/arch/x86/ker
(curctx->tinfo.preempt_count & SOFTIRQ_MASK);
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ __set_fs(irqctx->tinfo.addr_limit, smp_processor_id());
++ __set_fs(irqctx->tinfo.addr_limit);
+#endif
+
if (unlikely(overflow))
@@ -13215,7 +13070,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/irq_32.c linux-2.6.32.27/arch/x86/ker
: "memory", "cc", "ecx");
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ __set_fs(curctx->tinfo.addr_limit, smp_processor_id());
++ __set_fs(curctx->tinfo.addr_limit);
+#endif
+
return 1;
@@ -13229,13 +13084,13 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/irq_32.c linux-2.6.32.27/arch/x86/ker
+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ __set_fs(irqctx->tinfo.addr_limit, smp_processor_id());
++ __set_fs(irqctx->tinfo.addr_limit);
+#endif
call_on_stack(__do_softirq, isp);
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ __set_fs(curctx->addr_limit, smp_processor_id());
++ __set_fs(curctx->addr_limit);
+#endif
+
/*
@@ -13243,7 +13098,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/irq_32.c linux-2.6.32.27/arch/x86/ker
*/
diff -urNp linux-2.6.32.27/arch/x86/kernel/kgdb.c linux-2.6.32.27/arch/x86/kernel/kgdb.c
--- linux-2.6.32.27/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/kgdb.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
return instruction_pointer(regs);
}
@@ -13255,7 +13110,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/kgdb.c linux-2.6.32.27/arch/x86/kerne
.flags = KGDB_HW_BREAKPOINT,
diff -urNp linux-2.6.32.27/arch/x86/kernel/kprobes.c linux-2.6.32.27/arch/x86/kernel/kprobes.c
--- linux-2.6.32.27/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/kprobes.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/kprobes.c 2010-12-31 14:47:01.000000000 -0500
@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
char op;
s32 raddr;
@@ -13271,6 +13126,15 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/kprobes.c linux-2.6.32.27/arch/x86/ke
}
/*
+@@ -193,7 +197,7 @@ static int __kprobes can_boost(kprobe_op
+ kprobe_opcode_t opcode;
+ kprobe_opcode_t *orig_opcodes = opcodes;
+
+- if (search_exception_tables((unsigned long)opcodes))
++ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
+ return 0; /* Page fault may occur on this address. */
+
+ retry:
@@ -337,7 +341,9 @@ static void __kprobes fix_riprel(struct
disp = (u8 *) p->addr + *((s32 *) insn) -
(u8 *) p->ainsn.insn;
@@ -13350,7 +13214,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/kprobes.c linux-2.6.32.27/arch/x86/ke
switch (val) {
diff -urNp linux-2.6.32.27/arch/x86/kernel/ldt.c linux-2.6.32.27/arch/x86/kernel/ldt.c
--- linux-2.6.32.27/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/ldt.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/ldt.c 2010-12-31 14:46:53.000000000 -0500
@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -13417,7 +13281,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/ldt.c linux-2.6.32.27/arch/x86/kernel
ldt.avl = 0;
diff -urNp linux-2.6.32.27/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.27/arch/x86/kernel/machine_kexec_32.c
--- linux-2.6.32.27/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/machine_kexec_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/machine_kexec_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,7 +26,7 @@
#include <asm/system.h>
#include <asm/cacheflush.h>
@@ -13447,7 +13311,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.27/ar
page_list[PA_CONTROL_PAGE] = __pa(control_page);
diff -urNp linux-2.6.32.27/arch/x86/kernel/microcode_amd.c linux-2.6.32.27/arch/x86/kernel/microcode_amd.c
--- linux-2.6.32.27/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/microcode_amd.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/microcode_amd.c 2010-12-31 14:46:53.000000000 -0500
@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
@@ -13468,7 +13332,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/microcode_amd.c linux-2.6.32.27/arch/
}
diff -urNp linux-2.6.32.27/arch/x86/kernel/microcode_core.c linux-2.6.32.27/arch/x86/kernel/microcode_core.c
--- linux-2.6.32.27/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/microcode_core.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/microcode_core.c 2010-12-31 14:46:53.000000000 -0500
@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
@@ -13480,7 +13344,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/microcode_core.c linux-2.6.32.27/arch
* Synchronization.
diff -urNp linux-2.6.32.27/arch/x86/kernel/microcode_intel.c linux-2.6.32.27/arch/x86/kernel/microcode_intel.c
--- linux-2.6.32.27/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/microcode_intel.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/microcode_intel.c 2010-12-31 14:46:53.000000000 -0500
@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
static int get_ucode_user(void *to, const void *from, size_t n)
@@ -13517,7 +13381,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/microcode_intel.c linux-2.6.32.27/arc
}
diff -urNp linux-2.6.32.27/arch/x86/kernel/module.c linux-2.6.32.27/arch/x86/kernel/module.c
--- linux-2.6.32.27/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/module.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -34,7 +34,7 @@
#define DEBUGP(fmt...)
#endif
@@ -13660,7 +13524,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/module.c linux-2.6.32.27/arch/x86/ker
goto overflow;
diff -urNp linux-2.6.32.27/arch/x86/kernel/paravirt.c linux-2.6.32.27/arch/x86/kernel/paravirt.c
--- linux-2.6.32.27/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/paravirt.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/paravirt.c 2010-12-31 14:46:53.000000000 -0500
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
static void *get_call_destination(u8 type)
@@ -13766,7 +13630,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/paravirt.c linux-2.6.32.27/arch/x86/k
EXPORT_SYMBOL_GPL(pv_time_ops);
diff -urNp linux-2.6.32.27/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.27/arch/x86/kernel/paravirt-spinlocks.c
--- linux-2.6.32.27/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/paravirt-spinlocks.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/paravirt-spinlocks.c 2010-12-31 14:46:53.000000000 -0500
@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
__raw_spin_lock(lock);
}
@@ -13778,7 +13642,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.27/
.spin_is_contended = __ticket_spin_is_contended,
diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.27/arch/x86/kernel/pci-calgary_64.c
--- linux-2.6.32.27/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/pci-calgary_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/pci-calgary_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
@@ -13790,7 +13654,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.27/arch
.map_sg = calgary_map_sg,
diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-dma.c linux-2.6.32.27/arch/x86/kernel/pci-dma.c
--- linux-2.6.32.27/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/pci-dma.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,7 +14,7 @@
static int forbid_dac __read_mostly;
@@ -13811,7 +13675,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-dma.c linux-2.6.32.27/arch/x86/ke
if (mask > 0xffffffff && forbid_dac > 0) {
diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-gart_64.c linux-2.6.32.27/arch/x86/kernel/pci-gart_64.c
--- linux-2.6.32.27/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/pci-gart_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/pci-gart_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
return -1;
}
@@ -13823,7 +13687,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-gart_64.c linux-2.6.32.27/arch/x8
.map_page = gart_map_page,
diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-nommu.c linux-2.6.32.27/arch/x86/kernel/pci-nommu.c
--- linux-2.6.32.27/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/pci-nommu.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/pci-nommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
flush_write_buffers();
}
@@ -13835,7 +13699,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-nommu.c linux-2.6.32.27/arch/x86/
.map_sg = nommu_map_sg,
diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.27/arch/x86/kernel/pci-swiotlb.c
--- linux-2.6.32.27/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/pci-swiotlb.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
}
@@ -13847,7 +13711,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.27/arch/x8
.free_coherent = swiotlb_free_coherent,
diff -urNp linux-2.6.32.27/arch/x86/kernel/process_32.c linux-2.6.32.27/arch/x86/kernel/process_32.c
--- linux-2.6.32.27/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/process_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/process_32.c 2010-12-31 14:47:01.000000000 -0500
@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -13856,7 +13720,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process_32.c linux-2.6.32.27/arch/x86
}
#ifndef CONFIG_SMP
-@@ -129,7 +130,7 @@ void __show_regs(struct pt_regs *regs, i
+@@ -129,15 +130,14 @@ void __show_regs(struct pt_regs *regs, i
unsigned short ss, gs;
const char *board;
@@ -13864,8 +13728,17 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process_32.c linux-2.6.32.27/arch/x86
+ if (user_mode(regs)) {
sp = regs->sp;
ss = regs->ss & 0xffff;
- gs = get_user_gs(regs);
-@@ -210,8 +211,8 @@ int kernel_thread(int (*fn)(void *), voi
+- gs = get_user_gs(regs);
+ } else {
+ sp = (unsigned long) (&regs->sp);
+ savesegment(ss, ss);
+- savesegment(gs, gs);
+ }
++ gs = get_user_gs(regs);
+
+ printk("\n");
+
+@@ -210,10 +210,10 @@ int kernel_thread(int (*fn)(void *), voi
regs.bx = (unsigned long) fn;
regs.dx = (unsigned long) arg;
@@ -13874,9 +13747,12 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process_32.c linux-2.6.32.27/arch/x86
+ regs.ds = __KERNEL_DS;
+ regs.es = __KERNEL_DS;
regs.fs = __KERNEL_PERCPU;
- regs.gs = __KERNEL_STACK_CANARY;
+- regs.gs = __KERNEL_STACK_CANARY;
++ savesegment(gs, regs.gs);
regs.orig_ax = -1;
-@@ -247,7 +248,7 @@ int copy_thread(unsigned long clone_flag
+ regs.ip = (unsigned long) kernel_thread_helper;
+ regs.cs = __KERNEL_CS | get_kernel_rpl();
+@@ -247,7 +247,7 @@ int copy_thread(unsigned long clone_flag
struct task_struct *tsk;
int err;
@@ -13885,15 +13761,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process_32.c linux-2.6.32.27/arch/x86
*childregs = *regs;
childregs->ax = 0;
childregs->sp = sp;
-@@ -276,6 +277,7 @@ int copy_thread(unsigned long clone_flag
- * Set a new TLS for the child thread?
- */
- if (clone_flags & CLONE_SETTLS)
-+//XXX needs set_fs()?
- err = do_set_thread_area(p, -1,
- (struct user_desc __user *)childregs->si, 0);
-
-@@ -346,7 +348,7 @@ __switch_to(struct task_struct *prev_p,
+@@ -346,7 +346,7 @@ __switch_to(struct task_struct *prev_p,
struct thread_struct *prev = &prev_p->thread,
*next = &next_p->thread;
int cpu = smp_processor_id();
@@ -13902,19 +13770,18 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process_32.c linux-2.6.32.27/arch/x86
bool preload_fpu;
/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -381,6 +383,11 @@ __switch_to(struct task_struct *prev_p,
+@@ -381,6 +381,10 @@ __switch_to(struct task_struct *prev_p,
*/
lazy_save_gs(prev->gs);
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (!segment_eq(task_thread_info(prev_p)->addr_limit, task_thread_info(next_p)->addr_limit))
-+ __set_fs(task_thread_info(next_p)->addr_limit, cpu);
++ __set_fs(task_thread_info(next_p)->addr_limit);
+#endif
+
/*
* Load the per-thread Thread-Local Storage descriptor.
*/
-@@ -497,3 +504,27 @@ unsigned long get_wchan(struct task_stru
+@@ -497,3 +501,27 @@ unsigned long get_wchan(struct task_stru
return 0;
}
@@ -13944,7 +13811,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process_32.c linux-2.6.32.27/arch/x86
+#endif
diff -urNp linux-2.6.32.27/arch/x86/kernel/process_64.c linux-2.6.32.27/arch/x86/kernel/process_64.c
--- linux-2.6.32.27/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/process_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -91,7 +91,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -13989,7 +13856,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process_64.c linux-2.6.32.27/arch/x86
if (!in_sched_functions(ip))
diff -urNp linux-2.6.32.27/arch/x86/kernel/process.c linux-2.6.32.27/arch/x86/kernel/process.c
--- linux-2.6.32.27/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/process.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/process.c 2010-12-31 14:47:01.000000000 -0500
@@ -73,7 +73,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
@@ -14003,7 +13870,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process.c linux-2.6.32.27/arch/x86/ke
clear_tsk_thread_flag(tsk, TIF_DEBUG);
-+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR)
++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
+ loadsegment(gs, 0);
+#endif
tsk->thread.debugreg0 = 0;
@@ -14029,7 +13896,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/process.c linux-2.6.32.27/arch/x86/ke
-
diff -urNp linux-2.6.32.27/arch/x86/kernel/ptrace.c linux-2.6.32.27/arch/x86/kernel/ptrace.c
--- linux-2.6.32.27/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/ptrace.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/ptrace.c 2010-12-31 14:46:53.000000000 -0500
@@ -925,7 +925,7 @@ static const struct user_regset_view use
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{
@@ -14100,7 +13967,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/ptrace.c linux-2.6.32.27/arch/x86/ker
force_sig_info(SIGTRAP, &info, tsk);
diff -urNp linux-2.6.32.27/arch/x86/kernel/reboot.c linux-2.6.32.27/arch/x86/kernel/reboot.c
--- linux-2.6.32.27/arch/x86/kernel/reboot.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kernel/reboot.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/reboot.c 2010-12-31 14:46:53.000000000 -0500
@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -14179,7 +14046,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/reboot.c linux-2.6.32.27/arch/x86/ker
load_idt(&real_mode_idt);
diff -urNp linux-2.6.32.27/arch/x86/kernel/setup.c linux-2.6.32.27/arch/x86/kernel/setup.c
--- linux-2.6.32.27/arch/x86/kernel/setup.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kernel/setup.c 2010-12-09 18:30:30.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
@@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
@@ -14202,7 +14069,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/setup.c linux-2.6.32.27/arch/x86/kern
bss_resource.end = virt_to_phys(&__bss_stop)-1;
diff -urNp linux-2.6.32.27/arch/x86/kernel/setup_percpu.c linux-2.6.32.27/arch/x86/kernel/setup_percpu.c
--- linux-2.6.32.27/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/setup_percpu.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/setup_percpu.c 2010-12-31 14:46:53.000000000 -0500
@@ -25,19 +25,17 @@
# define DBG(x...)
#endif
@@ -14268,7 +14135,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/setup_percpu.c linux-2.6.32.27/arch/x
* area. Reload any changed state for the boot CPU.
diff -urNp linux-2.6.32.27/arch/x86/kernel/signal.c linux-2.6.32.27/arch/x86/kernel/signal.c
--- linux-2.6.32.27/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/signal.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/signal.c 2010-12-31 14:46:53.000000000 -0500
@@ -197,7 +197,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.
@@ -14345,7 +14212,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/signal.c linux-2.6.32.27/arch/x86/ker
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
diff -urNp linux-2.6.32.27/arch/x86/kernel/smpboot.c linux-2.6.32.27/arch/x86/kernel/smpboot.c
--- linux-2.6.32.27/arch/x86/kernel/smpboot.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kernel/smpboot.c 2010-12-09 18:30:30.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/smpboot.c 2010-12-31 14:46:53.000000000 -0500
@@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct
*/
static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
@@ -14392,7 +14259,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/smpboot.c linux-2.6.32.27/arch/x86/ke
if (err) {
diff -urNp linux-2.6.32.27/arch/x86/kernel/step.c linux-2.6.32.27/arch/x86/kernel/step.c
--- linux-2.6.32.27/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/step.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/step.c 2010-12-31 14:47:01.000000000 -0500
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -14406,7 +14273,17 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/step.c linux-2.6.32.27/arch/x86/kerne
addr = -1L; /* bogus selector, access would fault */
else {
desc = child->mm->context.ldt + seg;
-@@ -53,6 +53,9 @@ static int is_setting_trap_flag(struct t
+@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struc
+ addr += base;
+ }
+ mutex_unlock(&child->mm->context.lock);
+- }
++ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
++ addr = ktla_ktva(addr);
+
+ return addr;
+ }
+@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct t
unsigned char opcode[15];
unsigned long addr = convert_ip_to_linear(child, regs);
@@ -14416,7 +14293,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/step.c linux-2.6.32.27/arch/x86/kerne
copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
for (i = 0; i < copied; i++) {
switch (opcode[i]) {
-@@ -74,7 +77,7 @@ static int is_setting_trap_flag(struct t
+@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct t
#ifdef CONFIG_X86_64
case 0x40 ... 0x4f:
@@ -14427,7 +14304,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/step.c linux-2.6.32.27/arch/x86/kerne
/* 64-bit mode: REX prefix */
diff -urNp linux-2.6.32.27/arch/x86/kernel/syscall_table_32.S linux-2.6.32.27/arch/x86/kernel/syscall_table_32.S
--- linux-2.6.32.27/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/syscall_table_32.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/syscall_table_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -1,3 +1,4 @@
+.section .rodata,"a",@progbits
ENTRY(sys_call_table)
@@ -14435,7 +14312,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/syscall_table_32.S linux-2.6.32.27/ar
.long sys_exit
diff -urNp linux-2.6.32.27/arch/x86/kernel/sys_i386_32.c linux-2.6.32.27/arch/x86/kernel/sys_i386_32.c
--- linux-2.6.32.27/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/sys_i386_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/sys_i386_32.c 2010-12-31 14:47:01.000000000 -0500
@@ -24,6 +24,21 @@
#include <asm/syscalls.h>
@@ -14689,9 +14566,27 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/sys_i386_32.c linux-2.6.32.27/arch/x8
}
case 1: /* iBCS2 emulator entry point */
if (!segment_eq(get_fs(), get_ds()))
+@@ -207,17 +428,3 @@ asmlinkage int sys_olduname(struct oldol
+
+ return error;
+ }
+-
+-
+-/*
+- * Do a system call from kernel instead of calling sys_execve so we
+- * end up with proper pt_regs.
+- */
+-int kernel_execve(const char *filename, char *const argv[], char *const envp[])
+-{
+- long __res;
+- asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx"
+- : "=a" (__res)
+- : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
+- return __res;
+-}
diff -urNp linux-2.6.32.27/arch/x86/kernel/sys_x86_64.c linux-2.6.32.27/arch/x86/kernel/sys_x86_64.c
--- linux-2.6.32.27/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/sys_x86_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/sys_x86_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -14815,7 +14710,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/sys_x86_64.c linux-2.6.32.27/arch/x86
return addr;
diff -urNp linux-2.6.32.27/arch/x86/kernel/time.c linux-2.6.32.27/arch/x86/kernel/time.c
--- linux-2.6.32.27/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/time.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/time.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,17 +26,13 @@
int timer_ack;
#endif
@@ -14856,7 +14751,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/time.c linux-2.6.32.27/arch/x86/kerne
}
diff -urNp linux-2.6.32.27/arch/x86/kernel/tls.c linux-2.6.32.27/arch/x86/kernel/tls.c
--- linux-2.6.32.27/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/tls.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/tls.c 2010-12-31 14:46:53.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;
@@ -14871,7 +14766,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/tls.c linux-2.6.32.27/arch/x86/kernel
return 0;
diff -urNp linux-2.6.32.27/arch/x86/kernel/trampoline_32.S linux-2.6.32.27/arch/x86/kernel/trampoline_32.S
--- linux-2.6.32.27/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/trampoline_32.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/trampoline_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -14896,7 +14791,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/trampoline_32.S linux-2.6.32.27/arch/
# hence we don't use the boot_gdt_descr defined in head.S
diff -urNp linux-2.6.32.27/arch/x86/kernel/trampoline_64.S linux-2.6.32.27/arch/x86/kernel/trampoline_64.S
--- linux-2.6.32.27/arch/x86/kernel/trampoline_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/trampoline_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/trampoline_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -91,7 +91,7 @@ startup_32:
movl $__KERNEL_DS, %eax # Initialize the %ds segment register
movl %eax, %ds
@@ -14917,7 +14812,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/trampoline_64.S linux-2.6.32.27/arch/
.quad 0x00cf9b000000ffff # __KERNEL32_CS
diff -urNp linux-2.6.32.27/arch/x86/kernel/traps.c linux-2.6.32.27/arch/x86/kernel/traps.c
--- linux-2.6.32.27/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/traps.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -15069,7 +14964,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/traps.c linux-2.6.32.27/arch/x86/kern
}
diff -urNp linux-2.6.32.27/arch/x86/kernel/tsc.c linux-2.6.32.27/arch/x86/kernel/tsc.c
--- linux-2.6.32.27/arch/x86/kernel/tsc.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/tsc.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/tsc.c 2010-12-31 14:46:53.000000000 -0500
@@ -833,7 +833,7 @@ static struct dmi_system_id __initdata b
DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
},
@@ -15081,7 +14976,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/tsc.c linux-2.6.32.27/arch/x86/kernel
static void __init check_system_tsc_reliable(void)
diff -urNp linux-2.6.32.27/arch/x86/kernel/vm86_32.c linux-2.6.32.27/arch/x86/kernel/vm86_32.c
--- linux-2.6.32.27/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/vm86_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/vm86_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -15148,7 +15043,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vm86_32.c linux-2.6.32.27/arch/x86/ke
if ((segoffs >> 16) == BIOSSEG)
diff -urNp linux-2.6.32.27/arch/x86/kernel/vmi_32.c linux-2.6.32.27/arch/x86/kernel/vmi_32.c
--- linux-2.6.32.27/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/vmi_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/vmi_32.c 2010-12-31 14:47:01.000000000 -0500
@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
@@ -15216,7 +15111,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmi_32.c linux-2.6.32.27/arch/x86/ker
vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD);
}
#endif
-@@ -438,8 +444,8 @@ vmi_startup_ipi_hook(int phys_apicid, un
+@@ -438,10 +444,10 @@ vmi_startup_ipi_hook(int phys_apicid, un
ap.ss = __KERNEL_DS;
ap.esp = (unsigned long) start_esp;
@@ -15225,7 +15120,10 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmi_32.c linux-2.6.32.27/arch/x86/ker
+ ap.ds = __KERNEL_DS;
+ ap.es = __KERNEL_DS;
ap.fs = __KERNEL_PERCPU;
- ap.gs = __KERNEL_STACK_CANARY;
+- ap.gs = __KERNEL_STACK_CANARY;
++ savesegment(gs, ap.gs);
+
+ ap.eflags = 0;
@@ -486,6 +492,18 @@ static void vmi_leave_lazy_mmu(void)
paravirt_leave_lazy_mmu();
@@ -15310,7 +15208,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmi_32.c linux-2.6.32.27/arch/x86/ker
local_irq_save(flags);
diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S
--- linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S 2010-12-12 15:54:32.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S 2010-12-31 14:47:01.000000000 -0500
@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
@@ -15325,7 +15223,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x8
#undef i386 /* in case the preprocessor is a 32bit one */
-@@ -34,40 +41,55 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
+@@ -34,40 +41,53 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
#ifdef CONFIG_X86_32
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
@@ -15336,8 +15234,6 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x8
-jiffies_64 = jiffies;
#endif
-+jiffies = jiffies_64;
-+
PHDRS {
text PT_LOAD FLAGS(5); /* R_E */
- data PT_LOAD FLAGS(7); /* RWE */
@@ -15391,7 +15287,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x8
HEAD_TEXT
#ifdef CONFIG_X86_32
. = ALIGN(PAGE_SIZE);
-@@ -82,28 +104,71 @@ SECTIONS
+@@ -82,28 +102,71 @@ SECTIONS
IRQENTRY_TEXT
*(.fixup)
*(.gnu.warning)
@@ -15401,8 +15297,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x8
- NOTES :text :note
+ . += __KERNEL_TEXT_OFFSET;
-
-- EXCEPTION_TABLE(16) :text = 0x9090
++
+#ifdef CONFIG_X86_32
+ . = ALIGN(PAGE_SIZE);
+ .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) {
@@ -15422,7 +15317,8 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x8
+
+ } :module
+#endif
-+
+
+- EXCEPTION_TABLE(16) :text = 0x9090
+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
+ /* End of text section */
+ _etext = . - __KERNEL_TEXT_OFFSET;
@@ -15452,9 +15348,9 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x8
.data : AT(ADDR(.data) - LOAD_OFFSET) {
+
+#ifdef CONFIG_PAX_KERNEXEC
-+ . = ALIGN(HPAGE_SIZE);
++ . = ALIGN(HPAGE_SIZE);
+#else
-+ . = ALIGN(PAGE_SIZE);
++ . = ALIGN(PAGE_SIZE);
+#endif
+
/* Start of data section */
@@ -15470,6 +15366,15 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x8
PAGE_ALIGNED_DATA(PAGE_SIZE)
+@@ -112,6 +175,8 @@ SECTIONS
+ DATA_DATA
+ CONSTRUCTORS
+
++ jiffies = jiffies_64;
++
+ /* rarely changed data like cpu maps */
+ READ_MOSTLY_DATA(CONFIG_X86_INTERNODE_CACHE_BYTES)
+
@@ -166,12 +231,6 @@ SECTIONS
}
vgetcpu_mode = VVIRT(.vgetcpu_mode);
@@ -15598,7 +15503,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.27/arch/x8
#ifdef CONFIG_SMP
diff -urNp linux-2.6.32.27/arch/x86/kernel/vsyscall_64.c linux-2.6.32.27/arch/x86/kernel/vsyscall_64.c
--- linux-2.6.32.27/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/vsyscall_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/vsyscall_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -15634,7 +15539,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/vsyscall_64.c linux-2.6.32.27/arch/x8
diff -urNp linux-2.6.32.27/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.27/arch/x86/kernel/x8664_ksyms_64.c
--- linux-2.6.32.27/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/x8664_ksyms_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/x8664_ksyms_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic);
@@ -15646,7 +15551,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.27/arch
EXPORT_SYMBOL(copy_page);
diff -urNp linux-2.6.32.27/arch/x86/kernel/xsave.c linux-2.6.32.27/arch/x86/kernel/xsave.c
--- linux-2.6.32.27/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kernel/xsave.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kernel/xsave.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -1;
@@ -15676,7 +15581,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kernel/xsave.c linux-2.6.32.27/arch/x86/kern
/*
diff -urNp linux-2.6.32.27/arch/x86/kvm/emulate.c linux-2.6.32.27/arch/x86/kvm/emulate.c
--- linux-2.6.32.27/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kvm/emulate.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kvm/emulate.c 2010-12-31 14:46:53.000000000 -0500
@@ -81,8 +81,8 @@
#define Src2CL (1<<29)
#define Src2ImmByte (2<<29)
@@ -15715,7 +15620,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kvm/emulate.c linux-2.6.32.27/arch/x86/kvm/e
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
diff -urNp linux-2.6.32.27/arch/x86/kvm/lapic.c linux-2.6.32.27/arch/x86/kvm/lapic.c
--- linux-2.6.32.27/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/kvm/lapic.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kvm/lapic.c 2010-12-31 14:46:53.000000000 -0500
@@ -52,7 +52,7 @@
#define APIC_BUS_CYCLE_NS 1
@@ -15727,7 +15632,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kvm/lapic.c linux-2.6.32.27/arch/x86/kvm/lap
/* 14 is the version for Xeon and Pentium 8.4.8*/
diff -urNp linux-2.6.32.27/arch/x86/kvm/svm.c linux-2.6.32.27/arch/x86/kvm/svm.c
--- linux-2.6.32.27/arch/x86/kvm/svm.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kvm/svm.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kvm/svm.c 2010-12-31 14:46:53.000000000 -0500
@@ -2483,9 +2483,12 @@ static int handle_exit(struct kvm_run *k
static void reload_tss(struct kvm_vcpu *vcpu)
{
@@ -15753,7 +15658,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kvm/svm.c linux-2.6.32.27/arch/x86/kvm/svm.c
.hardware_setup = svm_hardware_setup,
diff -urNp linux-2.6.32.27/arch/x86/kvm/vmx.c linux-2.6.32.27/arch/x86/kvm/vmx.c
--- linux-2.6.32.27/arch/x86/kvm/vmx.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kvm/vmx.c 2010-12-09 18:30:30.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kvm/vmx.c 2010-12-31 14:46:53.000000000 -0500
@@ -570,7 +570,11 @@ static void reload_tss(void)
kvm_get_gdt(&gdt);
@@ -15837,7 +15742,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kvm/vmx.c linux-2.6.32.27/arch/x86/kvm/vmx.c
.hardware_setup = hardware_setup,
diff -urNp linux-2.6.32.27/arch/x86/kvm/x86.c linux-2.6.32.27/arch/x86/kvm/x86.c
--- linux-2.6.32.27/arch/x86/kvm/x86.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/kvm/x86.c 2010-12-09 18:30:30.000000000 -0500
++++ linux-2.6.32.27/arch/x86/kvm/x86.c 2010-12-31 14:46:53.000000000 -0500
@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries);
@@ -15941,7 +15846,7 @@ diff -urNp linux-2.6.32.27/arch/x86/kvm/x86.c linux-2.6.32.27/arch/x86/kvm/x86.c
printk(KERN_ERR "kvm: already loaded the other module\n");
diff -urNp linux-2.6.32.27/arch/x86/lib/checksum_32.S linux-2.6.32.27/arch/x86/lib/checksum_32.S
--- linux-2.6.32.27/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/checksum_32.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/checksum_32.S 2010-12-31 14:47:01.000000000 -0500
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -15961,14 +15866,14 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/checksum_32.S linux-2.6.32.27/arch/x86/l
+
+ENTRY(csum_partial_copy_generic_to_user)
CFI_STARTPROC
-+ pushl $(__USER_DS)
++ pushl %gs
+ CFI_ADJUST_CFA_OFFSET 4
+ popl %es
+ CFI_ADJUST_CFA_OFFSET -4
+ jmp csum_partial_copy_generic
+
+ENTRY(csum_partial_copy_generic_from_user)
-+ pushl $(__USER_DS)
++ pushl %gs
+ CFI_ADJUST_CFA_OFFSET 4
+ popl %ds
+ CFI_ADJUST_CFA_OFFSET -4
@@ -16110,14 +16015,14 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/checksum_32.S linux-2.6.32.27/arch/x86/l
+
+ENTRY(csum_partial_copy_generic_to_user)
CFI_STARTPROC
-+ pushl $(__USER_DS)
++ pushl %gs
+ CFI_ADJUST_CFA_OFFSET 4
+ popl %es
+ CFI_ADJUST_CFA_OFFSET -4
+ jmp csum_partial_copy_generic
+
+ENTRY(csum_partial_copy_generic_from_user)
-+ pushl $(__USER_DS)
++ pushl %gs
+ CFI_ADJUST_CFA_OFFSET 4
+ popl %ds
+ CFI_ADJUST_CFA_OFFSET -4
@@ -16189,7 +16094,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/checksum_32.S linux-2.6.32.27/arch/x86/l
#undef ROUND1
diff -urNp linux-2.6.32.27/arch/x86/lib/clear_page_64.S linux-2.6.32.27/arch/x86/lib/clear_page_64.S
--- linux-2.6.32.27/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/clear_page_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/clear_page_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ ENDPROC(clear_page)
#include <asm/cpufeature.h>
@@ -16201,7 +16106,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/clear_page_64.S linux-2.6.32.27/arch/x86
2:
diff -urNp linux-2.6.32.27/arch/x86/lib/copy_page_64.S linux-2.6.32.27/arch/x86/lib/copy_page_64.S
--- linux-2.6.32.27/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/copy_page_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/copy_page_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -104,7 +104,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
@@ -16213,7 +16118,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/copy_page_64.S linux-2.6.32.27/arch/x86/
2:
diff -urNp linux-2.6.32.27/arch/x86/lib/copy_user_64.S linux-2.6.32.27/arch/x86/lib/copy_user_64.S
--- linux-2.6.32.27/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/copy_user_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/copy_user_64.S 2010-12-31 14:47:01.000000000 -0500
@@ -15,13 +15,14 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -16230,7 +16135,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/copy_user_64.S linux-2.6.32.27/arch/x86/
2: .byte 0xe9 /* near jump with 32bit immediate */
.long \alt-1b /* offset */ /* or alternatively to alt */
.previous
-@@ -64,32 +65,6 @@
+@@ -64,49 +65,19 @@
#endif
.endm
@@ -16263,23 +16168,17 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/copy_user_64.S linux-2.6.32.27/arch/x86/
ENTRY(copy_user_generic)
CFI_STARTPROC
ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
-@@ -98,6 +73,15 @@ ENDPROC(copy_user_generic)
-
- ENTRY(__copy_from_user_inatomic)
- CFI_STARTPROC
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ mov $PAX_USER_SHADOW_BASE,%rcx
-+ cmp %rcx,%rsi
-+ jae 1f
-+ add %rcx,%rsi
-+1:
-+#endif
-+
- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
CFI_ENDPROC
- ENDPROC(__copy_from_user_inatomic)
-@@ -107,6 +91,8 @@ ENDPROC(__copy_from_user_inatomic)
+ ENDPROC(copy_user_generic)
+
+-ENTRY(__copy_from_user_inatomic)
+- CFI_STARTPROC
+- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
+- CFI_ENDPROC
+-ENDPROC(__copy_from_user_inatomic)
+-
+ .section .fixup,"ax"
+ /* must zero dest */
ENTRY(bad_from_user)
bad_from_user:
CFI_STARTPROC
@@ -16290,7 +16189,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/copy_user_64.S linux-2.6.32.27/arch/x86/
rep
diff -urNp linux-2.6.32.27/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.27/arch/x86/lib/copy_user_nocache_64.S
--- linux-2.6.32.27/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/copy_user_nocache_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/copy_user_nocache_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,7 @@
#include <asm/current.h>
#include <asm/asm-offsets.h>
@@ -16317,7 +16216,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.27/a
ALIGN_DESTINATION
diff -urNp linux-2.6.32.27/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.27/arch/x86/lib/csum-wrappers_64.c
--- linux-2.6.32.27/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/csum-wrappers_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/csum-wrappers_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -16338,25 +16237,29 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.27/arch/
}
diff -urNp linux-2.6.32.27/arch/x86/lib/getuser.S linux-2.6.32.27/arch/x86/lib/getuser.S
--- linux-2.6.32.27/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/getuser.S 2010-12-09 18:12:55.000000000 -0500
-@@ -33,14 +33,38 @@
++++ linux-2.6.32.27/arch/x86/lib/getuser.S 2010-12-31 14:47:01.000000000 -0500
+@@ -33,14 +33,35 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
#include <asm/asm.h>
+#include <asm/segment.h>
+#include <asm/pgtable.h>
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __copyuser_seg %gs:
++#else
++#define __copyuser_seg
++#endif
.text
ENTRY(__get_user_1)
CFI_STARTPROC
+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl $(__USER_DS)
-+ popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
+-1: movzb (%_ASM_AX),%edx
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
@@ -16368,29 +16271,21 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/getuser.S linux-2.6.32.27/arch/x86/lib/g
+
+#endif
+
- 1: movzb (%_ASM_AX),%edx
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ pop %ds
-+#endif
-+
++1: movzb __copyuser_seg (%_ASM_AX),%edx
xor %eax,%eax
ret
CFI_ENDPROC
-@@ -49,11 +73,33 @@ ENDPROC(__get_user_1)
+@@ -49,11 +70,24 @@ ENDPROC(__get_user_1)
ENTRY(__get_user_2)
CFI_STARTPROC
add $1,%_ASM_AX
+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl $(__USER_DS)
-+ popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
jc bad_get_user
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
+-2: movzwl -1(%_ASM_AX),%edx
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
@@ -16402,29 +16297,21 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/getuser.S linux-2.6.32.27/arch/x86/lib/g
+
+#endif
+
- 2: movzwl -1(%_ASM_AX),%edx
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ pop %ds
-+#endif
-+
++2: movzwl __copyuser_seg -1(%_ASM_AX),%edx
xor %eax,%eax
ret
CFI_ENDPROC
-@@ -62,11 +108,33 @@ ENDPROC(__get_user_2)
+@@ -62,11 +96,24 @@ ENDPROC(__get_user_2)
ENTRY(__get_user_4)
CFI_STARTPROC
add $3,%_ASM_AX
+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl $(__USER_DS)
-+ popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
jc bad_get_user
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
+-3: mov -3(%_ASM_AX),%edx
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
@@ -16436,17 +16323,11 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/getuser.S linux-2.6.32.27/arch/x86/lib/g
+
+#endif
+
- 3: mov -3(%_ASM_AX),%edx
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ pop %ds
-+#endif
-+
++3: mov __copyuser_seg -3(%_ASM_AX),%edx
xor %eax,%eax
ret
CFI_ENDPROC
-@@ -80,6 +148,15 @@ ENTRY(__get_user_8)
+@@ -80,6 +127,15 @@ ENTRY(__get_user_8)
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
@@ -16462,22 +16343,9 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/getuser.S linux-2.6.32.27/arch/x86/lib/g
4: movq -7(%_ASM_AX),%_ASM_DX
xor %eax,%eax
ret
-@@ -89,6 +166,12 @@ ENDPROC(__get_user_8)
-
- bad_get_user:
- CFI_STARTPROC
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ pop %ds
-+#endif
-+
- xor %edx,%edx
- mov $(-EFAULT),%_ASM_AX
- ret
diff -urNp linux-2.6.32.27/arch/x86/lib/memcpy_64.S linux-2.6.32.27/arch/x86/lib/memcpy_64.S
--- linux-2.6.32.27/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/memcpy_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/memcpy_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
* It is also a lot simpler. Use this when possible:
*/
@@ -16489,7 +16357,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/memcpy_64.S linux-2.6.32.27/arch/x86/lib
2:
diff -urNp linux-2.6.32.27/arch/x86/lib/memset_64.S linux-2.6.32.27/arch/x86/lib/memset_64.S
--- linux-2.6.32.27/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/memset_64.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/memset_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -118,7 +118,7 @@ ENDPROC(__memset)
#include <asm/cpufeature.h>
@@ -16501,7 +16369,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/memset_64.S linux-2.6.32.27/arch/x86/lib
2:
diff -urNp linux-2.6.32.27/arch/x86/lib/mmx_32.c linux-2.6.32.27/arch/x86/lib/mmx_32.c
--- linux-2.6.32.27/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/mmx_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/mmx_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -16819,7 +16687,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/mmx_32.c linux-2.6.32.27/arch/x86/lib/mm
to += 64;
diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/putuser.S
--- linux-2.6.32.27/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/putuser.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/putuser.S 2010-12-31 14:47:01.000000000 -0500
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -16830,7 +16698,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
/*
* __put_user_X
-@@ -29,59 +30,162 @@
+@@ -29,52 +30,119 @@
* as they get called from within inline assembly.
*/
@@ -16846,14 +16714,17 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
+#define _DEST %_ASM_CX
+#endif
+
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __copyuser_seg %gs:
++#else
++#define __copyuser_seg
++#endif
++
.text
ENTRY(__put_user_1)
ENTER
+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl $(__USER_DS)
-+ popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
+ GET_THREAD_INFO(%_ASM_BX)
cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
jae bad_put_user
@@ -16869,13 +16740,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
+
+#endif
+
-+1: movb %al,(_DEST)
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ popl %ds
-+#endif
-+
++1: movb %al,__copyuser_seg (_DEST)
xor %eax,%eax
EXIT
ENDPROC(__put_user_1)
@@ -16883,10 +16748,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
ENTRY(__put_user_2)
ENTER
+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl $(__USER_DS)
-+ popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
+ GET_THREAD_INFO(%_ASM_BX)
mov TI_addr_limit(%_ASM_BX),%_ASM_BX
sub $1,%_ASM_BX
@@ -16904,13 +16766,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
+
+#endif
+
-+2: movw %ax,(_DEST)
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ popl %ds
-+#endif
-+
++2: movw %ax,__copyuser_seg (_DEST)
xor %eax,%eax
EXIT
ENDPROC(__put_user_2)
@@ -16918,10 +16774,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
ENTRY(__put_user_4)
ENTER
+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl $(__USER_DS)
-+ popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
+ GET_THREAD_INFO(%_ASM_BX)
mov TI_addr_limit(%_ASM_BX),%_ASM_BX
sub $3,%_ASM_BX
@@ -16939,13 +16792,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
+
+#endif
+
-+3: movl %eax,(_DEST)
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ popl %ds
-+#endif
-+
++3: movl %eax,__copyuser_seg (_DEST)
xor %eax,%eax
EXIT
ENDPROC(__put_user_4)
@@ -16953,10 +16800,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
ENTRY(__put_user_8)
ENTER
+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl $(__USER_DS)
-+ popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
+ GET_THREAD_INFO(%_ASM_BX)
mov TI_addr_limit(%_ASM_BX),%_ASM_BX
sub $7,%_ASM_BX
@@ -16974,216 +16818,55 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/putuser.S linux-2.6.32.27/arch/x86/lib/p
+
+#endif
+
-+4: mov %_ASM_AX,(_DEST)
++4: mov %_ASM_AX,__copyuser_seg (_DEST)
#ifdef CONFIG_X86_32
-5: movl %edx,4(%_ASM_CX)
-+5: movl %edx,4(_DEST)
++5: movl %edx,__copyuser_seg 4(_DEST)
#endif
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ popl %ds
-+#endif
-+
xor %eax,%eax
EXIT
- ENDPROC(__put_user_8)
-
- bad_put_user:
- CFI_STARTPROC
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ pushl %ss
-+ popl %ds
-+#endif
-+
- movl $-EFAULT,%eax
- EXIT
- END(bad_put_user)
diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_32.c linux-2.6.32.27/arch/x86/lib/usercopy_32.c
--- linux-2.6.32.27/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/usercopy_32.c 2010-12-09 18:12:55.000000000 -0500
-@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
- * Copy a null terminated string from userspace.
- */
-
--#define __do_strncpy_from_user(dst, src, count, res) \
--do { \
-- int __d0, __d1, __d2; \
-- might_fault(); \
-- __asm__ __volatile__( \
-- " testl %1,%1\n" \
-- " jz 2f\n" \
++++ linux-2.6.32.27/arch/x86/lib/usercopy_32.c 2010-12-31 14:47:01.000000000 -0500
+@@ -43,7 +43,7 @@ do { \
+ __asm__ __volatile__( \
+ " testl %1,%1\n" \
+ " jz 2f\n" \
- "0: lodsb\n" \
-- " stosb\n" \
-- " testb %%al,%%al\n" \
-- " jz 1f\n" \
-- " decl %1\n" \
-- " jnz 0b\n" \
-- "1: subl %1,%0\n" \
-- "2:\n" \
-- ".section .fixup,\"ax\"\n" \
-- "3: movl %5,%0\n" \
-- " jmp 2b\n" \
-- ".previous\n" \
-- _ASM_EXTABLE(0b,3b) \
-- : "=&d"(res), "=&c"(count), "=&a" (__d0), "=&S" (__d1), \
-- "=&D" (__d2) \
-- : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst) \
-- : "memory"); \
--} while (0)
-+static long __do_strncpy_from_user(char *dst, const char __user *src, long count)
-+{
-+ int __d0, __d1, __d2;
-+ long res = -EFAULT;
-+
-+ might_fault();
-+ __asm__ __volatile__(
-+ " movw %w10,%%ds\n"
-+ " testl %1,%1\n"
-+ " jz 2f\n"
-+ "0: lodsb\n"
-+ " stosb\n"
-+ " testb %%al,%%al\n"
-+ " jz 1f\n"
-+ " decl %1\n"
-+ " jnz 0b\n"
-+ "1: subl %1,%0\n"
-+ "2:\n"
-+ " pushl %%ss\n"
-+ " popl %%ds\n"
-+ ".section .fixup,\"ax\"\n"
-+ "3: movl %5,%0\n"
-+ " jmp 2b\n"
-+ ".previous\n"
-+ _ASM_EXTABLE(0b,3b)
-+ : "=&d"(res), "=&c"(count), "=&a" (__d0), "=&S" (__d1),
-+ "=&D" (__d2)
-+ : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst),
-+ "r"(__USER_DS)
-+ : "memory");
-+ return res;
-+}
-
- /**
- * __strncpy_from_user: - Copy a NUL terminated string from userspace, with less checking.
-@@ -85,9 +92,7 @@ do { \
- long
- __strncpy_from_user(char *dst, const char __user *src, long count)
- {
-- long res;
-- __do_strncpy_from_user(dst, src, count, res);
-- return res;
-+ return __do_strncpy_from_user(dst, src, count);
- }
- EXPORT_SYMBOL(__strncpy_from_user);
-
-@@ -114,7 +119,7 @@ strncpy_from_user(char *dst, const char
- {
- long res = -EFAULT;
- if (access_ok(VERIFY_READ, src, 1))
-- __do_strncpy_from_user(dst, src, count, res);
-+ res = __do_strncpy_from_user(dst, src, count);
- return res;
- }
- EXPORT_SYMBOL(strncpy_from_user);
-@@ -123,24 +128,30 @@ EXPORT_SYMBOL(strncpy_from_user);
- * Zero Userspace
- */
-
--#define __do_clear_user(addr,size) \
--do { \
-- int __d0; \
-- might_fault(); \
-- __asm__ __volatile__( \
-- "0: rep; stosl\n" \
-- " movl %2,%0\n" \
-- "1: rep; stosb\n" \
-- "2:\n" \
-- ".section .fixup,\"ax\"\n" \
-- "3: lea 0(%2,%0,4),%0\n" \
-- " jmp 2b\n" \
-- ".previous\n" \
-- _ASM_EXTABLE(0b,3b) \
-- _ASM_EXTABLE(1b,2b) \
-- : "=&c"(size), "=&D" (__d0) \
-- : "r"(size & 3), "0"(size / 4), "1"(addr), "a"(0)); \
--} while (0)
-+static unsigned long __do_clear_user(void __user *addr, unsigned long size)
-+{
-+ int __d0;
-+
-+ might_fault();
-+ __asm__ __volatile__(
-+ " movw %w6,%%es\n"
-+ "0: rep; stosl\n"
-+ " movl %2,%0\n"
-+ "1: rep; stosb\n"
-+ "2:\n"
-+ " pushl %%ss\n"
-+ " popl %%es\n"
-+ ".section .fixup,\"ax\"\n"
-+ "3: lea 0(%2,%0,4),%0\n"
-+ " jmp 2b\n"
-+ ".previous\n"
-+ _ASM_EXTABLE(0b,3b)
-+ _ASM_EXTABLE(1b,2b)
-+ : "=&c"(size), "=&D" (__d0)
-+ : "r"(size & 3), "0"(size / 4), "1"(addr), "a"(0),
-+ "r"(__USER_DS));
-+ return size;
-+}
-
- /**
- * clear_user: - Zero a block of memory in user space.
-@@ -157,7 +168,7 @@ clear_user(void __user *to, unsigned lon
- {
- might_fault();
- if (access_ok(VERIFY_WRITE, to, n))
-- __do_clear_user(to, n);
-+ n = __do_clear_user(to, n);
- return n;
- }
- EXPORT_SYMBOL(clear_user);
-@@ -176,8 +187,7 @@ EXPORT_SYMBOL(clear_user);
- unsigned long
- __clear_user(void __user *to, unsigned long n)
- {
-- __do_clear_user(to, n);
-- return n;
-+ return __do_clear_user(to, n);
- }
- EXPORT_SYMBOL(__clear_user);
-
-@@ -200,14 +210,17 @@ long strnlen_user(const char __user *s,
++ "0: lodsb " __copyuser_seg" (%%esi)\n" \
+ " stosb\n" \
+ " testb %%al,%%al\n" \
+ " jz 1f\n" \
+@@ -128,10 +128,12 @@ do { \
+ int __d0; \
+ might_fault(); \
+ __asm__ __volatile__( \
++ __COPYUSER_SET_ES \
+ "0: rep; stosl\n" \
+ " movl %2,%0\n" \
+ "1: rep; stosb\n" \
+ "2:\n" \
++ __COPYUSER_RESTORE_ES \
+ ".section .fixup,\"ax\"\n" \
+ "3: lea 0(%2,%0,4),%0\n" \
+ " jmp 2b\n" \
+@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s,
might_fault();
__asm__ __volatile__(
-+ " movw %w8,%%es\n"
++ __COPYUSER_SET_ES
" testl %0, %0\n"
" jz 3f\n"
-- " andl %0,%%ecx\n"
-+ " movl %0,%%ecx\n"
- "0: repne; scasb\n"
- " setne %%al\n"
+ " andl %0,%%ecx\n"
+@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s,
" subl %%ecx,%0\n"
" addl %0,%%eax\n"
"1:\n"
-+ " pushl %%ss\n"
-+ " popl %%es\n"
++ __COPYUSER_RESTORE_ES
".section .fixup,\"ax\"\n"
"2: xorl %%eax,%%eax\n"
" jmp 1b\n"
-@@ -219,7 +232,7 @@ long strnlen_user(const char __user *s,
- " .long 0b,2b\n"
- ".previous"
- :"=&r" (n), "=&D" (s), "=&a" (res), "=&c" (tmp)
-- :"0" (n), "1" (s), "2" (0), "3" (mask)
-+ :"0" (n), "1" (s), "2" (0), "3" (mask), "r" (__USER_DS)
- :"cc");
- return res & mask;
- }
-@@ -227,10 +240,11 @@ EXPORT_SYMBOL(strnlen_user);
+@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
#ifdef CONFIG_X86_INTEL_USERCOPY
static unsigned long
@@ -17192,141 +16875,69 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_32.c linux-2.6.32.27/arch/x86/l
{
int d0, d1;
__asm__ __volatile__(
-+ " movw %w6, %%es\n"
- " .align 2,0x90\n"
- "1: movl 32(%4), %%eax\n"
- " cmpl $67, %0\n"
-@@ -239,36 +253,36 @@ __copy_user_intel(void __user *to, const
+@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const
" .align 2,0x90\n"
"3: movl 0(%4), %%eax\n"
"4: movl 4(%4), %%edx\n"
- "5: movl %%eax, 0(%3)\n"
- "6: movl %%edx, 4(%3)\n"
-+ "5: movl %%eax, %%es:0(%3)\n"
-+ "6: movl %%edx, %%es:4(%3)\n"
++ "5: movl %%eax, "__copyuser_seg" 0(%3)\n"
++ "6: movl %%edx, "__copyuser_seg" 4(%3)\n"
"7: movl 8(%4), %%eax\n"
"8: movl 12(%4),%%edx\n"
- "9: movl %%eax, 8(%3)\n"
- "10: movl %%edx, 12(%3)\n"
-+ "9: movl %%eax, %%es:8(%3)\n"
-+ "10: movl %%edx, %%es:12(%3)\n"
++ "9: movl %%eax, "__copyuser_seg" 8(%3)\n"
++ "10: movl %%edx, "__copyuser_seg" 12(%3)\n"
"11: movl 16(%4), %%eax\n"
"12: movl 20(%4), %%edx\n"
- "13: movl %%eax, 16(%3)\n"
- "14: movl %%edx, 20(%3)\n"
-+ "13: movl %%eax, %%es:16(%3)\n"
-+ "14: movl %%edx, %%es:20(%3)\n"
++ "13: movl %%eax, "__copyuser_seg" 16(%3)\n"
++ "14: movl %%edx, "__copyuser_seg" 20(%3)\n"
"15: movl 24(%4), %%eax\n"
"16: movl 28(%4), %%edx\n"
- "17: movl %%eax, 24(%3)\n"
- "18: movl %%edx, 28(%3)\n"
-+ "17: movl %%eax, %%es:24(%3)\n"
-+ "18: movl %%edx, %%es:28(%3)\n"
++ "17: movl %%eax, "__copyuser_seg" 24(%3)\n"
++ "18: movl %%edx, "__copyuser_seg" 28(%3)\n"
"19: movl 32(%4), %%eax\n"
"20: movl 36(%4), %%edx\n"
- "21: movl %%eax, 32(%3)\n"
- "22: movl %%edx, 36(%3)\n"
-+ "21: movl %%eax, %%es:32(%3)\n"
-+ "22: movl %%edx, %%es:36(%3)\n"
++ "21: movl %%eax, "__copyuser_seg" 32(%3)\n"
++ "22: movl %%edx, "__copyuser_seg" 36(%3)\n"
"23: movl 40(%4), %%eax\n"
"24: movl 44(%4), %%edx\n"
- "25: movl %%eax, 40(%3)\n"
- "26: movl %%edx, 44(%3)\n"
-+ "25: movl %%eax, %%es:40(%3)\n"
-+ "26: movl %%edx, %%es:44(%3)\n"
++ "25: movl %%eax, "__copyuser_seg" 40(%3)\n"
++ "26: movl %%edx, "__copyuser_seg" 44(%3)\n"
"27: movl 48(%4), %%eax\n"
"28: movl 52(%4), %%edx\n"
- "29: movl %%eax, 48(%3)\n"
- "30: movl %%edx, 52(%3)\n"
-+ "29: movl %%eax, %%es:48(%3)\n"
-+ "30: movl %%edx, %%es:52(%3)\n"
++ "29: movl %%eax, "__copyuser_seg" 48(%3)\n"
++ "30: movl %%edx, "__copyuser_seg" 52(%3)\n"
"31: movl 56(%4), %%eax\n"
"32: movl 60(%4), %%edx\n"
- "33: movl %%eax, 56(%3)\n"
- "34: movl %%edx, 60(%3)\n"
-+ "33: movl %%eax, %%es:56(%3)\n"
-+ "34: movl %%edx, %%es:60(%3)\n"
++ "33: movl %%eax, "__copyuser_seg" 56(%3)\n"
++ "34: movl %%edx, "__copyuser_seg" 60(%3)\n"
" addl $-64, %0\n"
" addl $64, %4\n"
" addl $64, %3\n"
-@@ -282,6 +296,8 @@ __copy_user_intel(void __user *to, const
+@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const
+ " shrl $2, %0\n"
+ " andl $3, %%eax\n"
+ " cld\n"
++ __COPYUSER_SET_ES
+ "99: rep; movsl\n"
"36: movl %%eax, %0\n"
"37: rep; movsb\n"
"100:\n"
-+ " pushl %%ss\n"
-+ " popl %%es\n"
- ".section .fixup,\"ax\"\n"
- "101: lea 0(%%eax,%0,4),%0\n"
- " jmp 100b\n"
-@@ -328,7 +344,117 @@ __copy_user_intel(void __user *to, const
- " .long 99b,101b\n"
- ".previous"
- : "=&c"(size), "=&D" (d0), "=&S" (d1)
-- : "1"(to), "2"(from), "0"(size)
-+ : "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
-+ : "eax", "edx", "memory");
-+ return size;
-+}
-+
-+static unsigned long
-+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
-+{
-+ int d0, d1;
-+ __asm__ __volatile__(
-+ " movw %w6, %%ds\n"
-+ " .align 2,0x90\n"
-+ "1: movl 32(%4), %%eax\n"
-+ " cmpl $67, %0\n"
-+ " jbe 3f\n"
-+ "2: movl 64(%4), %%eax\n"
-+ " .align 2,0x90\n"
-+ "3: movl 0(%4), %%eax\n"
-+ "4: movl 4(%4), %%edx\n"
-+ "5: movl %%eax, %%es:0(%3)\n"
-+ "6: movl %%edx, %%es:4(%3)\n"
-+ "7: movl 8(%4), %%eax\n"
-+ "8: movl 12(%4),%%edx\n"
-+ "9: movl %%eax, %%es:8(%3)\n"
-+ "10: movl %%edx, %%es:12(%3)\n"
-+ "11: movl 16(%4), %%eax\n"
-+ "12: movl 20(%4), %%edx\n"
-+ "13: movl %%eax, %%es:16(%3)\n"
-+ "14: movl %%edx, %%es:20(%3)\n"
-+ "15: movl 24(%4), %%eax\n"
-+ "16: movl 28(%4), %%edx\n"
-+ "17: movl %%eax, %%es:24(%3)\n"
-+ "18: movl %%edx, %%es:28(%3)\n"
-+ "19: movl 32(%4), %%eax\n"
-+ "20: movl 36(%4), %%edx\n"
-+ "21: movl %%eax, %%es:32(%3)\n"
-+ "22: movl %%edx, %%es:36(%3)\n"
-+ "23: movl 40(%4), %%eax\n"
-+ "24: movl 44(%4), %%edx\n"
-+ "25: movl %%eax, %%es:40(%3)\n"
-+ "26: movl %%edx, %%es:44(%3)\n"
-+ "27: movl 48(%4), %%eax\n"
-+ "28: movl 52(%4), %%edx\n"
-+ "29: movl %%eax, %%es:48(%3)\n"
-+ "30: movl %%edx, %%es:52(%3)\n"
-+ "31: movl 56(%4), %%eax\n"
-+ "32: movl 60(%4), %%edx\n"
-+ "33: movl %%eax, %%es:56(%3)\n"
-+ "34: movl %%edx, %%es:60(%3)\n"
-+ " addl $-64, %0\n"
-+ " addl $64, %4\n"
-+ " addl $64, %3\n"
-+ " cmpl $63, %0\n"
-+ " ja 1b\n"
-+ "35: movl %0, %%eax\n"
-+ " shrl $2, %0\n"
-+ " andl $3, %%eax\n"
-+ " cld\n"
-+ "99: rep; movsl\n"
-+ "36: movl %%eax, %0\n"
-+ "37: rep; movsb\n"
-+ "100:\n"
-+ " pushl %%ss\n"
-+ " popl %%ds\n"
++ __COPYUSER_RESTORE_ES
+ ".section .fixup,\"ax\"\n"
+ "101: lea 0(%%eax,%0,4),%0\n"
+ " jmp 100b\n"
@@ -17373,248 +16984,287 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_32.c linux-2.6.32.27/arch/x86/l
+ " .long 99b,101b\n"
+ ".previous"
+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
-+ : "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
- : "eax", "edx", "memory");
- return size;
- }
-@@ -338,6 +464,7 @@ __copy_user_zeroing_intel(void *to, cons
- {
++ : "1"(to), "2"(from), "0"(size)
++ : "eax", "edx", "memory");
++ return size;
++}
++
++static unsigned long
++__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
++{
++ int d0, d1;
++ __asm__ __volatile__(
++ " .align 2,0x90\n"
++ "1: movl "__copyuser_seg" 32(%4), %%eax\n"
++ " cmpl $67, %0\n"
++ " jbe 3f\n"
++ "2: movl "__copyuser_seg" 64(%4), %%eax\n"
++ " .align 2,0x90\n"
++ "3: movl "__copyuser_seg" 0(%4), %%eax\n"
++ "4: movl "__copyuser_seg" 4(%4), %%edx\n"
++ "5: movl %%eax, 0(%3)\n"
++ "6: movl %%edx, 4(%3)\n"
++ "7: movl "__copyuser_seg" 8(%4), %%eax\n"
++ "8: movl "__copyuser_seg" 12(%4),%%edx\n"
++ "9: movl %%eax, 8(%3)\n"
++ "10: movl %%edx, 12(%3)\n"
++ "11: movl "__copyuser_seg" 16(%4), %%eax\n"
++ "12: movl "__copyuser_seg" 20(%4), %%edx\n"
++ "13: movl %%eax, 16(%3)\n"
++ "14: movl %%edx, 20(%3)\n"
++ "15: movl "__copyuser_seg" 24(%4), %%eax\n"
++ "16: movl "__copyuser_seg" 28(%4), %%edx\n"
++ "17: movl %%eax, 24(%3)\n"
++ "18: movl %%edx, 28(%3)\n"
++ "19: movl "__copyuser_seg" 32(%4), %%eax\n"
++ "20: movl "__copyuser_seg" 36(%4), %%edx\n"
++ "21: movl %%eax, 32(%3)\n"
++ "22: movl %%edx, 36(%3)\n"
++ "23: movl "__copyuser_seg" 40(%4), %%eax\n"
++ "24: movl "__copyuser_seg" 44(%4), %%edx\n"
++ "25: movl %%eax, 40(%3)\n"
++ "26: movl %%edx, 44(%3)\n"
++ "27: movl "__copyuser_seg" 48(%4), %%eax\n"
++ "28: movl "__copyuser_seg" 52(%4), %%edx\n"
++ "29: movl %%eax, 48(%3)\n"
++ "30: movl %%edx, 52(%3)\n"
++ "31: movl "__copyuser_seg" 56(%4), %%eax\n"
++ "32: movl "__copyuser_seg" 60(%4), %%edx\n"
++ "33: movl %%eax, 56(%3)\n"
++ "34: movl %%edx, 60(%3)\n"
++ " addl $-64, %0\n"
++ " addl $64, %4\n"
++ " addl $64, %3\n"
++ " cmpl $63, %0\n"
++ " ja 1b\n"
++ "35: movl %0, %%eax\n"
++ " shrl $2, %0\n"
++ " andl $3, %%eax\n"
++ " cld\n"
++ "99: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
++ "36: movl %%eax, %0\n"
++ "37: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
++ "100:\n"
+ ".section .fixup,\"ax\"\n"
+ "101: lea 0(%%eax,%0,4),%0\n"
+ " jmp 100b\n"
+@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, cons
int d0, d1;
__asm__ __volatile__(
-+ " movw %w6, %%ds\n"
" .align 2,0x90\n"
- "0: movl 32(%4), %%eax\n"
+- "0: movl 32(%4), %%eax\n"
++ "0: movl "__copyuser_seg" 32(%4), %%eax\n"
" cmpl $67, %0\n"
-@@ -346,36 +473,36 @@ __copy_user_zeroing_intel(void *to, cons
+ " jbe 2f\n"
+- "1: movl 64(%4), %%eax\n"
++ "1: movl "__copyuser_seg" 64(%4), %%eax\n"
" .align 2,0x90\n"
- "2: movl 0(%4), %%eax\n"
- "21: movl 4(%4), %%edx\n"
-- " movl %%eax, 0(%3)\n"
-- " movl %%edx, 4(%3)\n"
-+ " movl %%eax, %%es:0(%3)\n"
-+ " movl %%edx, %%es:4(%3)\n"
- "3: movl 8(%4), %%eax\n"
- "31: movl 12(%4),%%edx\n"
-- " movl %%eax, 8(%3)\n"
-- " movl %%edx, 12(%3)\n"
-+ " movl %%eax, %%es:8(%3)\n"
-+ " movl %%edx, %%es:12(%3)\n"
- "4: movl 16(%4), %%eax\n"
- "41: movl 20(%4), %%edx\n"
-- " movl %%eax, 16(%3)\n"
-- " movl %%edx, 20(%3)\n"
-+ " movl %%eax, %%es:16(%3)\n"
-+ " movl %%edx, %%es:20(%3)\n"
- "10: movl 24(%4), %%eax\n"
- "51: movl 28(%4), %%edx\n"
-- " movl %%eax, 24(%3)\n"
-- " movl %%edx, 28(%3)\n"
-+ " movl %%eax, %%es:24(%3)\n"
-+ " movl %%edx, %%es:28(%3)\n"
- "11: movl 32(%4), %%eax\n"
- "61: movl 36(%4), %%edx\n"
-- " movl %%eax, 32(%3)\n"
-- " movl %%edx, 36(%3)\n"
-+ " movl %%eax, %%es:32(%3)\n"
-+ " movl %%edx, %%es:36(%3)\n"
- "12: movl 40(%4), %%eax\n"
- "71: movl 44(%4), %%edx\n"
-- " movl %%eax, 40(%3)\n"
-- " movl %%edx, 44(%3)\n"
-+ " movl %%eax, %%es:40(%3)\n"
-+ " movl %%edx, %%es:44(%3)\n"
- "13: movl 48(%4), %%eax\n"
- "81: movl 52(%4), %%edx\n"
-- " movl %%eax, 48(%3)\n"
-- " movl %%edx, 52(%3)\n"
-+ " movl %%eax, %%es:48(%3)\n"
-+ " movl %%edx, %%es:52(%3)\n"
- "14: movl 56(%4), %%eax\n"
- "91: movl 60(%4), %%edx\n"
-- " movl %%eax, 56(%3)\n"
-- " movl %%edx, 60(%3)\n"
-+ " movl %%eax, %%es:56(%3)\n"
-+ " movl %%edx, %%es:60(%3)\n"
+- "2: movl 0(%4), %%eax\n"
+- "21: movl 4(%4), %%edx\n"
++ "2: movl "__copyuser_seg" 0(%4), %%eax\n"
++ "21: movl "__copyuser_seg" 4(%4), %%edx\n"
+ " movl %%eax, 0(%3)\n"
+ " movl %%edx, 4(%3)\n"
+- "3: movl 8(%4), %%eax\n"
+- "31: movl 12(%4),%%edx\n"
++ "3: movl "__copyuser_seg" 8(%4), %%eax\n"
++ "31: movl "__copyuser_seg" 12(%4),%%edx\n"
+ " movl %%eax, 8(%3)\n"
+ " movl %%edx, 12(%3)\n"
+- "4: movl 16(%4), %%eax\n"
+- "41: movl 20(%4), %%edx\n"
++ "4: movl "__copyuser_seg" 16(%4), %%eax\n"
++ "41: movl "__copyuser_seg" 20(%4), %%edx\n"
+ " movl %%eax, 16(%3)\n"
+ " movl %%edx, 20(%3)\n"
+- "10: movl 24(%4), %%eax\n"
+- "51: movl 28(%4), %%edx\n"
++ "10: movl "__copyuser_seg" 24(%4), %%eax\n"
++ "51: movl "__copyuser_seg" 28(%4), %%edx\n"
+ " movl %%eax, 24(%3)\n"
+ " movl %%edx, 28(%3)\n"
+- "11: movl 32(%4), %%eax\n"
+- "61: movl 36(%4), %%edx\n"
++ "11: movl "__copyuser_seg" 32(%4), %%eax\n"
++ "61: movl "__copyuser_seg" 36(%4), %%edx\n"
+ " movl %%eax, 32(%3)\n"
+ " movl %%edx, 36(%3)\n"
+- "12: movl 40(%4), %%eax\n"
+- "71: movl 44(%4), %%edx\n"
++ "12: movl "__copyuser_seg" 40(%4), %%eax\n"
++ "71: movl "__copyuser_seg" 44(%4), %%edx\n"
+ " movl %%eax, 40(%3)\n"
+ " movl %%edx, 44(%3)\n"
+- "13: movl 48(%4), %%eax\n"
+- "81: movl 52(%4), %%edx\n"
++ "13: movl "__copyuser_seg" 48(%4), %%eax\n"
++ "81: movl "__copyuser_seg" 52(%4), %%edx\n"
+ " movl %%eax, 48(%3)\n"
+ " movl %%edx, 52(%3)\n"
+- "14: movl 56(%4), %%eax\n"
+- "91: movl 60(%4), %%edx\n"
++ "14: movl "__copyuser_seg" 56(%4), %%eax\n"
++ "91: movl "__copyuser_seg" 60(%4), %%edx\n"
+ " movl %%eax, 56(%3)\n"
+ " movl %%edx, 60(%3)\n"
" addl $-64, %0\n"
- " addl $64, %4\n"
- " addl $64, %3\n"
-@@ -389,6 +516,8 @@ __copy_user_zeroing_intel(void *to, cons
+@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, cons
+ " shrl $2, %0\n"
+ " andl $3, %%eax\n"
+ " cld\n"
+- "6: rep; movsl\n"
++ "6: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
" movl %%eax,%0\n"
- "7: rep; movsb\n"
+- "7: rep; movsb\n"
++ "7: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
"8:\n"
-+ " pushl %%ss\n"
-+ " popl %%ds\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
- "16: pushl %0\n"
-@@ -423,7 +552,7 @@ __copy_user_zeroing_intel(void *to, cons
- " .long 7b,16b\n"
- ".previous"
- : "=&c"(size), "=&D" (d0), "=&S" (d1)
-- : "1"(to), "2"(from), "0"(size)
-+ : "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
- : "eax", "edx", "memory");
- return size;
- }
-@@ -439,6 +568,7 @@ static unsigned long __copy_user_zeroing
- int d0, d1;
+@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing
__asm__ __volatile__(
-+ " movw %w6, %%ds\n"
" .align 2,0x90\n"
- "0: movl 32(%4), %%eax\n"
+- "0: movl 32(%4), %%eax\n"
++ "0: movl "__copyuser_seg" 32(%4), %%eax\n"
" cmpl $67, %0\n"
-@@ -447,36 +577,36 @@ static unsigned long __copy_user_zeroing
+ " jbe 2f\n"
+- "1: movl 64(%4), %%eax\n"
++ "1: movl "__copyuser_seg" 64(%4), %%eax\n"
" .align 2,0x90\n"
- "2: movl 0(%4), %%eax\n"
- "21: movl 4(%4), %%edx\n"
-- " movnti %%eax, 0(%3)\n"
-- " movnti %%edx, 4(%3)\n"
-+ " movnti %%eax, %%es:0(%3)\n"
-+ " movnti %%edx, %%es:4(%3)\n"
- "3: movl 8(%4), %%eax\n"
- "31: movl 12(%4),%%edx\n"
-- " movnti %%eax, 8(%3)\n"
-- " movnti %%edx, 12(%3)\n"
-+ " movnti %%eax, %%es:8(%3)\n"
-+ " movnti %%edx, %%es:12(%3)\n"
- "4: movl 16(%4), %%eax\n"
- "41: movl 20(%4), %%edx\n"
-- " movnti %%eax, 16(%3)\n"
-- " movnti %%edx, 20(%3)\n"
-+ " movnti %%eax, %%es:16(%3)\n"
-+ " movnti %%edx, %%es:20(%3)\n"
- "10: movl 24(%4), %%eax\n"
- "51: movl 28(%4), %%edx\n"
-- " movnti %%eax, 24(%3)\n"
-- " movnti %%edx, 28(%3)\n"
-+ " movnti %%eax, %%es:24(%3)\n"
-+ " movnti %%edx, %%es:28(%3)\n"
- "11: movl 32(%4), %%eax\n"
- "61: movl 36(%4), %%edx\n"
-- " movnti %%eax, 32(%3)\n"
-- " movnti %%edx, 36(%3)\n"
-+ " movnti %%eax, %%es:32(%3)\n"
-+ " movnti %%edx, %%es:36(%3)\n"
- "12: movl 40(%4), %%eax\n"
- "71: movl 44(%4), %%edx\n"
-- " movnti %%eax, 40(%3)\n"
-- " movnti %%edx, 44(%3)\n"
-+ " movnti %%eax, %%es:40(%3)\n"
-+ " movnti %%edx, %%es:44(%3)\n"
- "13: movl 48(%4), %%eax\n"
- "81: movl 52(%4), %%edx\n"
-- " movnti %%eax, 48(%3)\n"
-- " movnti %%edx, 52(%3)\n"
-+ " movnti %%eax, %%es:48(%3)\n"
-+ " movnti %%edx, %%es:52(%3)\n"
- "14: movl 56(%4), %%eax\n"
- "91: movl 60(%4), %%edx\n"
-- " movnti %%eax, 56(%3)\n"
-- " movnti %%edx, 60(%3)\n"
-+ " movnti %%eax, %%es:56(%3)\n"
-+ " movnti %%edx, %%es:60(%3)\n"
+- "2: movl 0(%4), %%eax\n"
+- "21: movl 4(%4), %%edx\n"
++ "2: movl "__copyuser_seg" 0(%4), %%eax\n"
++ "21: movl "__copyuser_seg" 4(%4), %%edx\n"
+ " movnti %%eax, 0(%3)\n"
+ " movnti %%edx, 4(%3)\n"
+- "3: movl 8(%4), %%eax\n"
+- "31: movl 12(%4),%%edx\n"
++ "3: movl "__copyuser_seg" 8(%4), %%eax\n"
++ "31: movl "__copyuser_seg" 12(%4),%%edx\n"
+ " movnti %%eax, 8(%3)\n"
+ " movnti %%edx, 12(%3)\n"
+- "4: movl 16(%4), %%eax\n"
+- "41: movl 20(%4), %%edx\n"
++ "4: movl "__copyuser_seg" 16(%4), %%eax\n"
++ "41: movl "__copyuser_seg" 20(%4), %%edx\n"
+ " movnti %%eax, 16(%3)\n"
+ " movnti %%edx, 20(%3)\n"
+- "10: movl 24(%4), %%eax\n"
+- "51: movl 28(%4), %%edx\n"
++ "10: movl "__copyuser_seg" 24(%4), %%eax\n"
++ "51: movl "__copyuser_seg" 28(%4), %%edx\n"
+ " movnti %%eax, 24(%3)\n"
+ " movnti %%edx, 28(%3)\n"
+- "11: movl 32(%4), %%eax\n"
+- "61: movl 36(%4), %%edx\n"
++ "11: movl "__copyuser_seg" 32(%4), %%eax\n"
++ "61: movl "__copyuser_seg" 36(%4), %%edx\n"
+ " movnti %%eax, 32(%3)\n"
+ " movnti %%edx, 36(%3)\n"
+- "12: movl 40(%4), %%eax\n"
+- "71: movl 44(%4), %%edx\n"
++ "12: movl "__copyuser_seg" 40(%4), %%eax\n"
++ "71: movl "__copyuser_seg" 44(%4), %%edx\n"
+ " movnti %%eax, 40(%3)\n"
+ " movnti %%edx, 44(%3)\n"
+- "13: movl 48(%4), %%eax\n"
+- "81: movl 52(%4), %%edx\n"
++ "13: movl "__copyuser_seg" 48(%4), %%eax\n"
++ "81: movl "__copyuser_seg" 52(%4), %%edx\n"
+ " movnti %%eax, 48(%3)\n"
+ " movnti %%edx, 52(%3)\n"
+- "14: movl 56(%4), %%eax\n"
+- "91: movl 60(%4), %%edx\n"
++ "14: movl "__copyuser_seg" 56(%4), %%eax\n"
++ "91: movl "__copyuser_seg" 60(%4), %%edx\n"
+ " movnti %%eax, 56(%3)\n"
+ " movnti %%edx, 60(%3)\n"
" addl $-64, %0\n"
- " addl $64, %4\n"
- " addl $64, %3\n"
-@@ -491,6 +621,8 @@ static unsigned long __copy_user_zeroing
+@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing
+ " shrl $2, %0\n"
+ " andl $3, %%eax\n"
+ " cld\n"
+- "6: rep; movsl\n"
++ "6: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
" movl %%eax,%0\n"
- "7: rep; movsb\n"
+- "7: rep; movsb\n"
++ "7: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
"8:\n"
-+ " pushl %%ss\n"
-+ " popl %%ds\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
- "16: pushl %0\n"
-@@ -525,7 +657,7 @@ static unsigned long __copy_user_zeroing
- " .long 7b,16b\n"
- ".previous"
- : "=&c"(size), "=&D" (d0), "=&S" (d1)
-- : "1"(to), "2"(from), "0"(size)
-+ : "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
- : "eax", "edx", "memory");
- return size;
- }
-@@ -536,6 +668,7 @@ static unsigned long __copy_user_intel_n
- int d0, d1;
+@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_n
__asm__ __volatile__(
-+ " movw %w6, %%ds\n"
" .align 2,0x90\n"
- "0: movl 32(%4), %%eax\n"
+- "0: movl 32(%4), %%eax\n"
++ "0: movl "__copyuser_seg" 32(%4), %%eax\n"
" cmpl $67, %0\n"
-@@ -544,36 +677,36 @@ static unsigned long __copy_user_intel_n
+ " jbe 2f\n"
+- "1: movl 64(%4), %%eax\n"
++ "1: movl "__copyuser_seg" 64(%4), %%eax\n"
" .align 2,0x90\n"
- "2: movl 0(%4), %%eax\n"
- "21: movl 4(%4), %%edx\n"
-- " movnti %%eax, 0(%3)\n"
-- " movnti %%edx, 4(%3)\n"
-+ " movnti %%eax, %%es:0(%3)\n"
-+ " movnti %%edx, %%es:4(%3)\n"
- "3: movl 8(%4), %%eax\n"
- "31: movl 12(%4),%%edx\n"
-- " movnti %%eax, 8(%3)\n"
-- " movnti %%edx, 12(%3)\n"
-+ " movnti %%eax, %%es:8(%3)\n"
-+ " movnti %%edx, %%es:12(%3)\n"
- "4: movl 16(%4), %%eax\n"
- "41: movl 20(%4), %%edx\n"
-- " movnti %%eax, 16(%3)\n"
-- " movnti %%edx, 20(%3)\n"
-+ " movnti %%eax, %%es:16(%3)\n"
-+ " movnti %%edx, %%es:20(%3)\n"
- "10: movl 24(%4), %%eax\n"
- "51: movl 28(%4), %%edx\n"
-- " movnti %%eax, 24(%3)\n"
-- " movnti %%edx, 28(%3)\n"
-+ " movnti %%eax, %%es:24(%3)\n"
-+ " movnti %%edx, %%es:28(%3)\n"
- "11: movl 32(%4), %%eax\n"
- "61: movl 36(%4), %%edx\n"
-- " movnti %%eax, 32(%3)\n"
-- " movnti %%edx, 36(%3)\n"
-+ " movnti %%eax, %%es:32(%3)\n"
-+ " movnti %%edx, %%es:36(%3)\n"
- "12: movl 40(%4), %%eax\n"
- "71: movl 44(%4), %%edx\n"
-- " movnti %%eax, 40(%3)\n"
-- " movnti %%edx, 44(%3)\n"
-+ " movnti %%eax, %%es:40(%3)\n"
-+ " movnti %%edx, %%es:44(%3)\n"
- "13: movl 48(%4), %%eax\n"
- "81: movl 52(%4), %%edx\n"
-- " movnti %%eax, 48(%3)\n"
-- " movnti %%edx, 52(%3)\n"
-+ " movnti %%eax, %%es:48(%3)\n"
-+ " movnti %%edx, %%es:52(%3)\n"
- "14: movl 56(%4), %%eax\n"
- "91: movl 60(%4), %%edx\n"
-- " movnti %%eax, 56(%3)\n"
-- " movnti %%edx, 60(%3)\n"
-+ " movnti %%eax, %%es:56(%3)\n"
-+ " movnti %%edx, %%es:60(%3)\n"
+- "2: movl 0(%4), %%eax\n"
+- "21: movl 4(%4), %%edx\n"
++ "2: movl "__copyuser_seg" 0(%4), %%eax\n"
++ "21: movl "__copyuser_seg" 4(%4), %%edx\n"
+ " movnti %%eax, 0(%3)\n"
+ " movnti %%edx, 4(%3)\n"
+- "3: movl 8(%4), %%eax\n"
+- "31: movl 12(%4),%%edx\n"
++ "3: movl "__copyuser_seg" 8(%4), %%eax\n"
++ "31: movl "__copyuser_seg" 12(%4),%%edx\n"
+ " movnti %%eax, 8(%3)\n"
+ " movnti %%edx, 12(%3)\n"
+- "4: movl 16(%4), %%eax\n"
+- "41: movl 20(%4), %%edx\n"
++ "4: movl "__copyuser_seg" 16(%4), %%eax\n"
++ "41: movl "__copyuser_seg" 20(%4), %%edx\n"
+ " movnti %%eax, 16(%3)\n"
+ " movnti %%edx, 20(%3)\n"
+- "10: movl 24(%4), %%eax\n"
+- "51: movl 28(%4), %%edx\n"
++ "10: movl "__copyuser_seg" 24(%4), %%eax\n"
++ "51: movl "__copyuser_seg" 28(%4), %%edx\n"
+ " movnti %%eax, 24(%3)\n"
+ " movnti %%edx, 28(%3)\n"
+- "11: movl 32(%4), %%eax\n"
+- "61: movl 36(%4), %%edx\n"
++ "11: movl "__copyuser_seg" 32(%4), %%eax\n"
++ "61: movl "__copyuser_seg" 36(%4), %%edx\n"
+ " movnti %%eax, 32(%3)\n"
+ " movnti %%edx, 36(%3)\n"
+- "12: movl 40(%4), %%eax\n"
+- "71: movl 44(%4), %%edx\n"
++ "12: movl "__copyuser_seg" 40(%4), %%eax\n"
++ "71: movl "__copyuser_seg" 44(%4), %%edx\n"
+ " movnti %%eax, 40(%3)\n"
+ " movnti %%edx, 44(%3)\n"
+- "13: movl 48(%4), %%eax\n"
+- "81: movl 52(%4), %%edx\n"
++ "13: movl "__copyuser_seg" 48(%4), %%eax\n"
++ "81: movl "__copyuser_seg" 52(%4), %%edx\n"
+ " movnti %%eax, 48(%3)\n"
+ " movnti %%edx, 52(%3)\n"
+- "14: movl 56(%4), %%eax\n"
+- "91: movl 60(%4), %%edx\n"
++ "14: movl "__copyuser_seg" 56(%4), %%eax\n"
++ "91: movl "__copyuser_seg" 60(%4), %%edx\n"
+ " movnti %%eax, 56(%3)\n"
+ " movnti %%edx, 60(%3)\n"
" addl $-64, %0\n"
- " addl $64, %4\n"
- " addl $64, %3\n"
-@@ -588,6 +721,8 @@ static unsigned long __copy_user_intel_n
+@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_n
+ " shrl $2, %0\n"
+ " andl $3, %%eax\n"
+ " cld\n"
+- "6: rep; movsl\n"
++ "6: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
" movl %%eax,%0\n"
- "7: rep; movsb\n"
+- "7: rep; movsb\n"
++ "7: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
"8:\n"
-+ " pushl %%ss\n"
-+ " popl %%ds\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
- "16: jmp 8b\n"
-@@ -616,7 +751,7 @@ static unsigned long __copy_user_intel_n
- " .long 7b,16b\n"
- ".previous"
- : "=&c"(size), "=&D" (d0), "=&S" (d1)
-- : "1"(to), "2"(from), "0"(size)
-+ : "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
- : "eax", "edx", "memory");
- return size;
- }
-@@ -629,90 +764,146 @@ static unsigned long __copy_user_intel_n
+@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_n
*/
unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
unsigned long size);
@@ -17629,243 +17279,69 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_32.c linux-2.6.32.27/arch/x86/l
/* Generic arbitrary sized copy. */
-#define __copy_user(to, from, size) \
--do { \
-- int __d0, __d1, __d2; \
-- __asm__ __volatile__( \
-- " cmp $7,%0\n" \
-- " jbe 1f\n" \
-- " movl %1,%0\n" \
-- " negl %0\n" \
-- " andl $7,%0\n" \
-- " subl %0,%3\n" \
++#define __copy_user(to, from, size, prefix, set, restore) \
+ do { \
+ int __d0, __d1, __d2; \
+ __asm__ __volatile__( \
++ set \
+ " cmp $7,%0\n" \
+ " jbe 1f\n" \
+ " movl %1,%0\n" \
+ " negl %0\n" \
+ " andl $7,%0\n" \
+ " subl %0,%3\n" \
- "4: rep; movsb\n" \
-- " movl %3,%0\n" \
-- " shrl $2,%0\n" \
-- " andl $3,%3\n" \
-- " .align 2,0x90\n" \
++ "4: rep; movsb "prefix" (%%esi), (%%edi)\n" \
+ " movl %3,%0\n" \
+ " shrl $2,%0\n" \
+ " andl $3,%3\n" \
+ " .align 2,0x90\n" \
- "0: rep; movsl\n" \
-- " movl %3,%0\n" \
++ "0: rep; movsl "prefix" (%%esi), (%%edi)\n" \
+ " movl %3,%0\n" \
- "1: rep; movsb\n" \
-- "2:\n" \
-- ".section .fixup,\"ax\"\n" \
-- "5: addl %3,%0\n" \
-- " jmp 2b\n" \
-- "3: lea 0(%3,%0,4),%0\n" \
-- " jmp 2b\n" \
-- ".previous\n" \
-- ".section __ex_table,\"a\"\n" \
-- " .align 4\n" \
-- " .long 4b,5b\n" \
-- " .long 0b,3b\n" \
-- " .long 1b,2b\n" \
-- ".previous" \
-- : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2) \
-- : "3"(size), "0"(size), "1"(to), "2"(from) \
-- : "memory"); \
--} while (0)
--
--#define __copy_user_zeroing(to, from, size) \
--do { \
-- int __d0, __d1, __d2; \
-- __asm__ __volatile__( \
-- " cmp $7,%0\n" \
-- " jbe 1f\n" \
-- " movl %1,%0\n" \
-- " negl %0\n" \
-- " andl $7,%0\n" \
-- " subl %0,%3\n" \
++ "1: rep; movsb "prefix" (%%esi), (%%edi)\n" \
+ "2:\n" \
++ restore \
+ ".section .fixup,\"ax\"\n" \
+ "5: addl %3,%0\n" \
+ " jmp 2b\n" \
+@@ -682,14 +799,14 @@ do { \
+ " negl %0\n" \
+ " andl $7,%0\n" \
+ " subl %0,%3\n" \
- "4: rep; movsb\n" \
-- " movl %3,%0\n" \
-- " shrl $2,%0\n" \
-- " andl $3,%3\n" \
-- " .align 2,0x90\n" \
++ "4: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n" \
+ " movl %3,%0\n" \
+ " shrl $2,%0\n" \
+ " andl $3,%3\n" \
+ " .align 2,0x90\n" \
- "0: rep; movsl\n" \
-- " movl %3,%0\n" \
++ "0: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n" \
+ " movl %3,%0\n" \
- "1: rep; movsb\n" \
-- "2:\n" \
-- ".section .fixup,\"ax\"\n" \
-- "5: addl %3,%0\n" \
-- " jmp 6f\n" \
-- "3: lea 0(%3,%0,4),%0\n" \
-- "6: pushl %0\n" \
-- " pushl %%eax\n" \
-- " xorl %%eax,%%eax\n" \
-- " rep; stosb\n" \
-- " popl %%eax\n" \
-- " popl %0\n" \
-- " jmp 2b\n" \
-- ".previous\n" \
-- ".section __ex_table,\"a\"\n" \
-- " .align 4\n" \
-- " .long 4b,5b\n" \
-- " .long 0b,3b\n" \
-- " .long 1b,6b\n" \
-- ".previous" \
-- : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2) \
-- : "3"(size), "0"(size), "1"(to), "2"(from) \
-- : "memory"); \
--} while (0)
-+static unsigned long
-+__generic_copy_to_user(void __user *to, const void *from, unsigned long size)
-+{
-+ int __d0, __d1, __d2;
-+
-+ __asm__ __volatile__(
-+ " movw %w8,%%es\n"
-+ " cmp $7,%0\n"
-+ " jbe 1f\n"
-+ " movl %1,%0\n"
-+ " negl %0\n"
-+ " andl $7,%0\n"
-+ " subl %0,%3\n"
-+ "4: rep; movsb\n"
-+ " movl %3,%0\n"
-+ " shrl $2,%0\n"
-+ " andl $3,%3\n"
-+ " .align 2,0x90\n"
-+ "0: rep; movsl\n"
-+ " movl %3,%0\n"
-+ "1: rep; movsb\n"
-+ "2:\n"
-+ " pushl %%ss\n"
-+ " popl %%es\n"
-+ ".section .fixup,\"ax\"\n"
-+ "5: addl %3,%0\n"
-+ " jmp 2b\n"
-+ "3: lea 0(%3,%0,4),%0\n"
-+ " jmp 2b\n"
-+ ".previous\n"
-+ ".section __ex_table,\"a\"\n"
-+ " .align 4\n"
-+ " .long 4b,5b\n"
-+ " .long 0b,3b\n"
-+ " .long 1b,2b\n"
-+ ".previous"
-+ : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2)
-+ : "3"(size), "0"(size), "1"(to), "2"(from), "r"(__USER_DS)
-+ : "memory");
-+ return size;
-+}
-+
-+static unsigned long
-+__generic_copy_from_user(void *to, const void __user *from, unsigned long size)
-+{
-+ int __d0, __d1, __d2;
-+
-+ __asm__ __volatile__(
-+ " movw %w8,%%ds\n"
-+ " cmp $7,%0\n"
-+ " jbe 1f\n"
-+ " movl %1,%0\n"
-+ " negl %0\n"
-+ " andl $7,%0\n"
-+ " subl %0,%3\n"
-+ "4: rep; movsb\n"
-+ " movl %3,%0\n"
-+ " shrl $2,%0\n"
-+ " andl $3,%3\n"
-+ " .align 2,0x90\n"
-+ "0: rep; movsl\n"
-+ " movl %3,%0\n"
-+ "1: rep; movsb\n"
-+ "2:\n"
-+ " pushl %%ss\n"
-+ " popl %%ds\n"
-+ ".section .fixup,\"ax\"\n"
-+ "5: addl %3,%0\n"
-+ " jmp 2b\n"
-+ "3: lea 0(%3,%0,4),%0\n"
-+ " jmp 2b\n"
-+ ".previous\n"
-+ ".section __ex_table,\"a\"\n"
-+ " .align 4\n"
-+ " .long 4b,5b\n"
-+ " .long 0b,3b\n"
-+ " .long 1b,2b\n"
-+ ".previous"
-+ : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2)
-+ : "3"(size), "0"(size), "1"(to), "2"(from), "r"(__USER_DS)
-+ : "memory");
-+ return size;
-+}
-+
-+static unsigned long
-+__copy_user_zeroing(void *to, const void __user *from, unsigned long size)
-+{
-+ int __d0, __d1, __d2;
-+
-+ __asm__ __volatile__(
-+ " movw %w8,%%ds\n"
-+ " cmp $7,%0\n"
-+ " jbe 1f\n"
-+ " movl %1,%0\n"
-+ " negl %0\n"
-+ " andl $7,%0\n"
-+ " subl %0,%3\n"
-+ "4: rep; movsb\n"
-+ " movl %3,%0\n"
-+ " shrl $2,%0\n"
-+ " andl $3,%3\n"
-+ " .align 2,0x90\n"
-+ "0: rep; movsl\n"
-+ " movl %3,%0\n"
-+ "1: rep; movsb\n"
-+ "2:\n"
-+ " pushl %%ss\n"
-+ " popl %%ds\n"
-+ ".section .fixup,\"ax\"\n"
-+ "5: addl %3,%0\n"
-+ " jmp 6f\n"
-+ "3: lea 0(%3,%0,4),%0\n"
-+ "6: pushl %0\n"
-+ " pushl %%eax\n"
-+ " xorl %%eax,%%eax\n"
-+ " rep; stosb\n"
-+ " popl %%eax\n"
-+ " popl %0\n"
-+ " jmp 2b\n"
-+ ".previous\n"
-+ ".section __ex_table,\"a\"\n"
-+ " .align 4\n"
-+ " .long 4b,5b\n"
-+ " .long 0b,3b\n"
-+ " .long 1b,6b\n"
-+ ".previous"
-+ : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2)
-+ : "3"(size), "0"(size), "1"(to), "2"(from), "r"(__USER_DS)
-+ : "memory");
-+ return size;
-+}
-
- unsigned long __copy_to_user_ll(void __user *to, const void *from,
- unsigned long n)
-@@ -775,9 +966,9 @@ survive:
++ "1: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n" \
+ "2:\n" \
+ ".section .fixup,\"ax\"\n" \
+ "5: addl %3,%0\n" \
+@@ -775,9 +892,9 @@ survive:
}
#endif
if (movsl_is_ok(to, from, n))
- __copy_user(to, from, n);
-+ n = __generic_copy_to_user(to, from, n);
++ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
else
- n = __copy_user_intel(to, from, n);
+ n = __generic_copy_to_user_intel(to, from, n);
return n;
}
EXPORT_SYMBOL(__copy_to_user_ll);
-@@ -786,7 +977,7 @@ unsigned long __copy_from_user_ll(void *
- unsigned long n)
- {
- if (movsl_is_ok(to, from, n))
-- __copy_user_zeroing(to, from, n);
-+ n = __copy_user_zeroing(to, from, n);
- else
- n = __copy_user_zeroing_intel(to, from, n);
- return n;
-@@ -797,10 +988,9 @@ unsigned long __copy_from_user_ll_nozero
+@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero
unsigned long n)
{
if (movsl_is_ok(to, from, n))
- __copy_user(to, from, n);
-+ n = __generic_copy_from_user(to, from, n);
++ __copy_user(to, from, n, __copyuser_seg, "", "");
else
- n = __copy_user_intel((void __user *)to,
- (const void *)from, n);
@@ -17873,27 +17349,15 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_32.c linux-2.6.32.27/arch/x86/l
return n;
}
EXPORT_SYMBOL(__copy_from_user_ll_nozero);
-@@ -812,9 +1002,9 @@ unsigned long __copy_from_user_ll_nocach
- if (n > 64 && cpu_has_xmm2)
- n = __copy_user_zeroing_intel_nocache(to, from, n);
- else
-- __copy_user_zeroing(to, from, n);
-+ n = __copy_user_zeroing(to, from, n);
- #else
-- __copy_user_zeroing(to, from, n);
-+ n = __copy_user_zeroing(to, from, n);
- #endif
- return n;
- }
-@@ -827,59 +1017,40 @@ unsigned long __copy_from_user_ll_nocach
+@@ -827,59 +943,37 @@ unsigned long __copy_from_user_ll_nocach
if (n > 64 && cpu_has_xmm2)
n = __copy_user_intel_nocache(to, from, n);
else
- __copy_user(to, from, n);
-+ n = __generic_copy_from_user(to, from, n);
++ __copy_user(to, from, n, __copyuser_seg, "", "");
#else
- __copy_user(to, from, n);
-+ n = __generic_copy_from_user(to, from, n);
++ __copy_user(to, from, n, __copyuser_seg, "", "");
#endif
return n;
}
@@ -17915,22 +17379,25 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_32.c linux-2.6.32.27/arch/x86/l
-unsigned long
-copy_to_user(void __user *to, const void *from, unsigned long n)
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+void __set_fs(mm_segment_t x, int cpu)
++void __set_fs(mm_segment_t x)
{
- if (access_ok(VERIFY_WRITE, to, n))
- n = __copy_to_user(to, from, n);
- return n;
-+ unsigned long limit = x.seg;
-+ struct desc_struct d;
-+
-+ current_thread_info()->addr_limit = x;
-+ if (unlikely(paravirt_enabled()))
-+ return;
-+
-+ if (likely(limit))
-+ limit = (limit - 1UL) >> PAGE_SHIFT;
-+ pack_descriptor(&d, 0UL, limit, 0xF3, 0xC);
-+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_DS, &d, DESCTYPE_S);
++ switch (x.seg) {
++ case 0:
++ loadsegment(gs, 0);
++ break;
++ case TASK_SIZE_MAX:
++ loadsegment(gs, __USER_DS);
++ break;
++ case -1UL:
++ loadsegment(gs, __KERNEL_DS);
++ break;
++ default:
++ BUG();
++ }
++ return;
}
-EXPORT_SYMBOL(copy_to_user);
@@ -17959,21 +17426,15 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_32.c linux-2.6.32.27/arch/x86/l
- else
- memset(to, 0, n);
- return n;
-+ __set_fs(x, get_cpu());
-+ put_cpu();
++ current_thread_info()->addr_limit = x;
++ __set_fs(x);
}
-EXPORT_SYMBOL(copy_from_user);
-+#else
-+void set_fs(mm_segment_t x)
-+{
-+ current_thread_info()->addr_limit = x;
-+}
-+#endif
-+
+EXPORT_SYMBOL(set_fs);
++#endif
diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_64.c linux-2.6.32.27/arch/x86/lib/usercopy_64.c
--- linux-2.6.32.27/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/lib/usercopy_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -42,6 +42,8 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -18012,7 +17473,7 @@ diff -urNp linux-2.6.32.27/arch/x86/lib/usercopy_64.c linux-2.6.32.27/arch/x86/l
diff -urNp linux-2.6.32.27/arch/x86/Makefile linux-2.6.32.27/arch/x86/Makefile
--- linux-2.6.32.27/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/Makefile 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -189,3 +189,12 @@ define archhelp
echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
@@ -18028,7 +17489,7 @@ diff -urNp linux-2.6.32.27/arch/x86/Makefile linux-2.6.32.27/arch/x86/Makefile
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
diff -urNp linux-2.6.32.27/arch/x86/mm/extable.c linux-2.6.32.27/arch/x86/mm/extable.c
--- linux-2.6.32.27/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/extable.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/extable.c 2010-12-31 14:46:53.000000000 -0500
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
@@ -18104,7 +17565,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/extable.c linux-2.6.32.27/arch/x86/mm/ext
pnp_bios_is_utter_crap = 1;
diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault.c
--- linux-2.6.32.27/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/fault.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/fault.c 2010-12-31 14:47:01.000000000 -0500
@@ -11,10 +11,19 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -18134,7 +17595,31 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
preempt_disable();
if (kprobe_running() && kprobe_fault_handler(regs, 14))
ret = 1;
-@@ -172,6 +181,30 @@ force_sig_info_fault(int si_signo, int s
+@@ -112,7 +121,10 @@ check_prefetch_opcode(struct pt_regs *re
+ return !instr_lo || (instr_lo>>1) == 1;
+ case 0x00:
+ /* Prefetch instruction is 0x0F0D or 0x0F18 */
+- if (probe_kernel_address(instr, opcode))
++ if (user_mode(regs)) {
++ if (__copy_from_user_inatomic(&opcode, (__force unsigned char __user *)(instr), 1))
++ return 0;
++ } else if (probe_kernel_address(instr, opcode))
+ return 0;
+
+ *prefetch = (instr_lo == 0xF) &&
+@@ -146,7 +158,10 @@ is_prefetch(struct pt_regs *regs, unsign
+ while (instr < max_instr) {
+ unsigned char opcode;
+
+- if (probe_kernel_address(instr, opcode))
++ if (user_mode(regs)) {
++ if (__copy_from_user_inatomic(&opcode, (__force unsigned char __user *)(instr), 1))
++ break;
++ } else if (probe_kernel_address(instr, opcode))
+ break;
+
+ instr++;
+@@ -172,6 +187,30 @@ force_sig_info_fault(int si_signo, int s
force_sig_info(si_signo, &info, tsk);
}
@@ -18165,7 +17650,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
DEFINE_SPINLOCK(pgd_lock);
LIST_HEAD(pgd_list);
-@@ -224,11 +257,24 @@ void vmalloc_sync_all(void)
+@@ -224,11 +263,24 @@ void vmalloc_sync_all(void)
address += PMD_SIZE) {
unsigned long flags;
@@ -18191,7 +17676,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
break;
}
spin_unlock_irqrestore(&pgd_lock, flags);
-@@ -258,6 +304,11 @@ static noinline int vmalloc_fault(unsign
+@@ -258,6 +310,11 @@ static noinline int vmalloc_fault(unsign
* an interrupt in the middle of a task switch..
*/
pgd_paddr = read_cr3();
@@ -18203,7 +17688,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
if (!pmd_k)
return -1;
-@@ -332,15 +383,27 @@ void vmalloc_sync_all(void)
+@@ -332,15 +389,27 @@ void vmalloc_sync_all(void)
const pgd_t *pgd_ref = pgd_offset_k(address);
unsigned long flags;
@@ -18231,7 +17716,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
if (pgd_none(*pgd))
set_pgd(pgd, *pgd_ref);
else
-@@ -373,7 +436,14 @@ static noinline int vmalloc_fault(unsign
+@@ -373,7 +442,14 @@ static noinline int vmalloc_fault(unsign
* happen within a race in page table update. In the later
* case just flush:
*/
@@ -18246,7 +17731,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
pgd_ref = pgd_offset_k(address);
if (pgd_none(*pgd_ref))
return -1;
-@@ -535,7 +605,7 @@ static int is_errata93(struct pt_regs *r
+@@ -535,7 +611,7 @@ static int is_errata93(struct pt_regs *r
static int is_errata100(struct pt_regs *regs, unsigned long address)
{
#ifdef CONFIG_X86_64
@@ -18255,7 +17740,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
return 1;
#endif
return 0;
-@@ -562,7 +632,7 @@ static int is_f00f_bug(struct pt_regs *r
+@@ -562,7 +638,7 @@ static int is_f00f_bug(struct pt_regs *r
}
static const char nx_warning[] = KERN_CRIT
@@ -18264,7 +17749,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
static void
show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -571,15 +641,26 @@ show_fault_oops(struct pt_regs *regs, un
+@@ -571,15 +647,26 @@ show_fault_oops(struct pt_regs *regs, un
if (!oops_may_print())
return;
@@ -18293,7 +17778,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE)
printk(KERN_CONT "NULL pointer dereference");
-@@ -704,6 +785,68 @@ __bad_area_nosemaphore(struct pt_regs *r
+@@ -704,6 +791,68 @@ __bad_area_nosemaphore(struct pt_regs *r
unsigned long address, int si_code)
{
struct task_struct *tsk = current;
@@ -18362,7 +17847,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
/* User mode accesses just cause a SIGSEGV */
if (error_code & PF_USER) {
-@@ -850,6 +993,106 @@ static int spurious_fault_check(unsigned
+@@ -850,6 +999,99 @@ static int spurious_fault_check(unsigned
return 1;
}
@@ -18431,9 +17916,6 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
+ * PaX: fill DTLB with user rights and retry
+ */
+ __asm__ __volatile__ (
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ "movw %w4,%%es\n"
-+#endif
+ "orb %2,(%1)\n"
+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
+/*
@@ -18451,14 +17933,10 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
+ */
+ "invlpg (%0)\n"
+#endif
-+ "testb $0,%%es:(%0)\n"
++ "testb $0,"__copyuser_seg"(%0)\n"
+ "xorb %3,(%1)\n"
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ "pushl %%ss\n"
-+ "popl %%es\n"
-+#endif
+ :
-+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER), "r" (__USER_DS)
++ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
+ : "memory", "cc");
+ pte_unmap_unlock(pte, ptl);
+ up_read(&mm->mmap_sem);
@@ -18469,7 +17947,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
/*
* Handle a spurious fault caused by a stale TLB entry.
*
-@@ -916,6 +1159,9 @@ int show_unhandled_signals = 1;
+@@ -916,6 +1158,9 @@ int show_unhandled_signals = 1;
static inline int
access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
{
@@ -18479,7 +17957,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
if (write) {
/* write, present and write, not present: */
if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -949,17 +1195,31 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -949,17 +1194,31 @@ do_page_fault(struct pt_regs *regs, unsi
{
struct vm_area_struct *vma;
struct task_struct *tsk;
@@ -18515,7 +17993,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
/*
* Detect and handle instructions that would cause a page fault for
* both a tracked kernel page and a userspace page.
-@@ -1019,7 +1279,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1019,7 +1278,7 @@ do_page_fault(struct pt_regs *regs, unsi
* User-mode registers count as a user access even for any
* potential system fault or CPU buglet:
*/
@@ -18524,7 +18002,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
local_irq_enable();
error_code |= PF_USER;
} else {
-@@ -1073,6 +1333,11 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1073,6 +1332,11 @@ do_page_fault(struct pt_regs *regs, unsi
might_sleep();
}
@@ -18536,7 +18014,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
vma = find_vma(mm, address);
if (unlikely(!vma)) {
bad_area(regs, error_code, address);
-@@ -1084,18 +1349,24 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1084,18 +1348,24 @@ do_page_fault(struct pt_regs *regs, unsi
bad_area(regs, error_code, address);
return;
}
@@ -18560,19 +18038,19 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
+ bad_area(regs, error_code, address);
+ return;
- }
++ }
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
+ bad_area(regs, error_code, address);
+ return;
-+ }
+ }
+#endif
+
if (unlikely(expand_stack(vma, address))) {
bad_area(regs, error_code, address);
return;
-@@ -1139,3 +1410,199 @@ good_area:
+@@ -1139,3 +1409,199 @@ good_area:
up_read(&mm->mmap_sem);
}
@@ -18774,7 +18252,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/fault.c linux-2.6.32.27/arch/x86/mm/fault
+}
diff -urNp linux-2.6.32.27/arch/x86/mm/gup.c linux-2.6.32.27/arch/x86/mm/gup.c
--- linux-2.6.32.27/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/gup.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/gup.c 2010-12-31 14:46:53.000000000 -0500
@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -18786,7 +18264,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/gup.c linux-2.6.32.27/arch/x86/mm/gup.c
diff -urNp linux-2.6.32.27/arch/x86/mm/highmem_32.c linux-2.6.32.27/arch/x86/mm/highmem_32.c
--- linux-2.6.32.27/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/highmem_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/highmem_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -18800,7 +18278,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/highmem_32.c linux-2.6.32.27/arch/x86/mm/
}
diff -urNp linux-2.6.32.27/arch/x86/mm/hugetlbpage.c linux-2.6.32.27/arch/x86/mm/hugetlbpage.c
--- linux-2.6.32.27/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/hugetlbpage.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -19006,7 +18484,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/hugetlbpage.c linux-2.6.32.27/arch/x86/mm
if (mm->get_unmapped_area == arch_get_unmapped_area)
diff -urNp linux-2.6.32.27/arch/x86/mm/init_32.c linux-2.6.32.27/arch/x86/mm/init_32.c
--- linux-2.6.32.27/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/init_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
}
@@ -19312,7 +18790,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/init_32.c linux-2.6.32.27/arch/x86/mm/ini
size >> 10);
diff -urNp linux-2.6.32.27/arch/x86/mm/init_64.c linux-2.6.32.27/arch/x86/mm/init_64.c
--- linux-2.6.32.27/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/init_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/init_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
pmd = fill_pmd(pud, vaddr);
pte = fill_pte(pmd, vaddr);
@@ -19375,7 +18853,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/init_64.c linux-2.6.32.27/arch/x86/mm/ini
return "[vsyscall]";
diff -urNp linux-2.6.32.27/arch/x86/mm/init.c linux-2.6.32.27/arch/x86/mm/init.c
--- linux-2.6.32.27/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/init.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/init.c 2010-12-31 14:46:53.000000000 -0500
@@ -69,11 +69,7 @@ static void __init find_early_table_spac
* cause a hotspot and fill up ZONE_DMA. The page tables
* need roughly 0.5KB per GB.
@@ -19502,7 +18980,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/init.c linux-2.6.32.27/arch/x86/mm/init.c
(unsigned long)(&__init_end));
diff -urNp linux-2.6.32.27/arch/x86/mm/iomap_32.c linux-2.6.32.27/arch/x86/mm/iomap_32.c
--- linux-2.6.32.27/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/iomap_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/iomap_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
debug_kmap_atomic(type);
idx = type + KM_TYPE_NR * smp_processor_id();
@@ -19517,7 +18995,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/iomap_32.c linux-2.6.32.27/arch/x86/mm/io
return (void *)vaddr;
diff -urNp linux-2.6.32.27/arch/x86/mm/ioremap.c linux-2.6.32.27/arch/x86/mm/ioremap.c
--- linux-2.6.32.27/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/ioremap.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/ioremap.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
* Second special case: Some BIOSen report the PC BIOS
* area (640->1Mb) as ram even though it is not.
@@ -19566,7 +19044,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/ioremap.c linux-2.6.32.27/arch/x86/mm/ior
* The boot-ioremap range spans multiple pmds, for which
diff -urNp linux-2.6.32.27/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.27/arch/x86/mm/kmemcheck/kmemcheck.c
--- linux-2.6.32.27/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/kmemcheck/kmemcheck.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/kmemcheck/kmemcheck.c 2010-12-31 14:46:53.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.
@@ -19581,7 +19059,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.27/arc
pte = kmemcheck_pte_lookup(address);
diff -urNp linux-2.6.32.27/arch/x86/mm/mmap.c linux-2.6.32.27/arch/x86/mm/mmap.c
--- linux-2.6.32.27/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/mmap.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -19665,7 +19143,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/mmap.c linux-2.6.32.27/arch/x86/mm/mmap.c
}
diff -urNp linux-2.6.32.27/arch/x86/mm/numa_32.c linux-2.6.32.27/arch/x86/mm/numa_32.c
--- linux-2.6.32.27/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/numa_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/numa_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
@@ -19676,7 +19154,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/numa_32.c linux-2.6.32.27/arch/x86/mm/num
#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
diff -urNp linux-2.6.32.27/arch/x86/mm/pageattr.c linux-2.6.32.27/arch/x86/mm/pageattr.c
--- linux-2.6.32.27/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/pageattr.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/pageattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
* PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
*/
@@ -19755,7 +19233,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/pageattr.c linux-2.6.32.27/arch/x86/mm/pa
static int
diff -urNp linux-2.6.32.27/arch/x86/mm/pageattr-test.c linux-2.6.32.27/arch/x86/mm/pageattr-test.c
--- linux-2.6.32.27/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/pageattr-test.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/pageattr-test.c 2010-12-31 14:46:53.000000000 -0500
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
@@ -19767,7 +19245,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/pageattr-test.c linux-2.6.32.27/arch/x86/
struct split_state {
diff -urNp linux-2.6.32.27/arch/x86/mm/pat.c linux-2.6.32.27/arch/x86/mm/pat.c
--- linux-2.6.32.27/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/pat.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/pat.c 2010-12-31 14:46:53.000000000 -0500
@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
conflict:
@@ -19817,7 +19295,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/pat.c linux-2.6.32.27/arch/x86/mm/pat.c
(unsigned long long)(paddr + size),
diff -urNp linux-2.6.32.27/arch/x86/mm/pgtable_32.c linux-2.6.32.27/arch/x86/mm/pgtable_32.c
--- linux-2.6.32.27/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/pgtable_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/pgtable_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
@@ -19834,7 +19312,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/pgtable_32.c linux-2.6.32.27/arch/x86/mm/
* It's enough to flush this one mapping.
diff -urNp linux-2.6.32.27/arch/x86/mm/pgtable.c linux-2.6.32.27/arch/x86/mm/pgtable.c
--- linux-2.6.32.27/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/pgtable.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/pgtable.c 2010-12-31 14:46:53.000000000 -0500
@@ -83,8 +83,58 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
@@ -20089,7 +19567,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/pgtable.c linux-2.6.32.27/arch/x86/mm/pgt
free_page((unsigned long)pgd);
diff -urNp linux-2.6.32.27/arch/x86/mm/setup_nx.c linux-2.6.32.27/arch/x86/mm/setup_nx.c
--- linux-2.6.32.27/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/setup_nx.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/setup_nx.c 2010-12-31 14:46:53.000000000 -0500
@@ -4,11 +4,10 @@
#include <asm/pgtable.h>
@@ -20157,7 +19635,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/setup_nx.c linux-2.6.32.27/arch/x86/mm/se
#endif
diff -urNp linux-2.6.32.27/arch/x86/mm/tlb.c linux-2.6.32.27/arch/x86/mm/tlb.c
--- linux-2.6.32.27/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/mm/tlb.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/mm/tlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -12,7 +12,7 @@
#include <asm/uv/uv.h>
@@ -20181,7 +19659,7 @@ diff -urNp linux-2.6.32.27/arch/x86/mm/tlb.c linux-2.6.32.27/arch/x86/mm/tlb.c
diff -urNp linux-2.6.32.27/arch/x86/oprofile/backtrace.c linux-2.6.32.27/arch/x86/oprofile/backtrace.c
--- linux-2.6.32.27/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/oprofile/backtrace.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/oprofile/backtrace.c 2010-12-31 14:46:53.000000000 -0500
@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
struct frame_head bufhead[2];
@@ -20202,7 +19680,7 @@ diff -urNp linux-2.6.32.27/arch/x86/oprofile/backtrace.c linux-2.6.32.27/arch/x8
dump_trace(NULL, regs, (unsigned long *)stack, 0,
diff -urNp linux-2.6.32.27/arch/x86/oprofile/op_model_p4.c linux-2.6.32.27/arch/x86/oprofile/op_model_p4.c
--- linux-2.6.32.27/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/oprofile/op_model_p4.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/oprofile/op_model_p4.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
@@ -20214,7 +19692,7 @@ diff -urNp linux-2.6.32.27/arch/x86/oprofile/op_model_p4.c linux-2.6.32.27/arch/
return smp_num_siblings == 2 ? 2 : 1;
diff -urNp linux-2.6.32.27/arch/x86/pci/common.c linux-2.6.32.27/arch/x86/pci/common.c
--- linux-2.6.32.27/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/common.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/common.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,8 +31,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
@@ -20237,7 +19715,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/common.c linux-2.6.32.27/arch/x86/pci/co
void __init dmi_check_pciprobe(void)
diff -urNp linux-2.6.32.27/arch/x86/pci/direct.c linux-2.6.32.27/arch/x86/pci/direct.c
--- linux-2.6.32.27/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/direct.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/direct.c 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
#undef PCI_CONF1_ADDRESS
@@ -20267,7 +19745,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/direct.c linux-2.6.32.27/arch/x86/pci/di
int year, devfn;
diff -urNp linux-2.6.32.27/arch/x86/pci/fixup.c linux-2.6.32.27/arch/x86/pci/fixup.c
--- linux-2.6.32.27/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/fixup.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/fixup.c 2010-12-31 14:46:53.000000000 -0500
@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
},
@@ -20288,7 +19766,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/fixup.c linux-2.6.32.27/arch/x86/pci/fix
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
diff -urNp linux-2.6.32.27/arch/x86/pci/irq.c linux-2.6.32.27/arch/x86/pci/irq.c
--- linux-2.6.32.27/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/irq.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/irq.c 2010-12-31 14:46:53.000000000 -0500
@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
static struct pci_device_id __initdata pirq_440gx[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -20309,7 +19787,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/irq.c linux-2.6.32.27/arch/x86/pci/irq.c
int __init pcibios_irq_init(void)
diff -urNp linux-2.6.32.27/arch/x86/pci/mmconfig_32.c linux-2.6.32.27/arch/x86/pci/mmconfig_32.c
--- linux-2.6.32.27/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/mmconfig_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/mmconfig_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -20321,7 +19799,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/mmconfig_32.c linux-2.6.32.27/arch/x86/p
};
diff -urNp linux-2.6.32.27/arch/x86/pci/mmconfig_64.c linux-2.6.32.27/arch/x86/pci/mmconfig_64.c
--- linux-2.6.32.27/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/mmconfig_64.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/mmconfig_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -20333,7 +19811,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/mmconfig_64.c linux-2.6.32.27/arch/x86/p
};
diff -urNp linux-2.6.32.27/arch/x86/pci/numaq_32.c linux-2.6.32.27/arch/x86/pci/numaq_32.c
--- linux-2.6.32.27/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/numaq_32.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/numaq_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
@@ -20345,7 +19823,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/numaq_32.c linux-2.6.32.27/arch/x86/pci/
};
diff -urNp linux-2.6.32.27/arch/x86/pci/olpc.c linux-2.6.32.27/arch/x86/pci/olpc.c
--- linux-2.6.32.27/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/olpc.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/olpc.c 2010-12-31 14:46:53.000000000 -0500
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
@@ -20357,7 +19835,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/olpc.c linux-2.6.32.27/arch/x86/pci/olpc
};
diff -urNp linux-2.6.32.27/arch/x86/pci/pcbios.c linux-2.6.32.27/arch/x86/pci/pcbios.c
--- linux-2.6.32.27/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/pci/pcbios.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/pci/pcbios.c 2010-12-31 14:46:53.000000000 -0500
@@ -56,50 +56,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -20682,7 +20160,7 @@ diff -urNp linux-2.6.32.27/arch/x86/pci/pcbios.c linux-2.6.32.27/arch/x86/pci/pc
EXPORT_SYMBOL(pcibios_set_irq_routing);
diff -urNp linux-2.6.32.27/arch/x86/power/cpu.c linux-2.6.32.27/arch/x86/power/cpu.c
--- linux-2.6.32.27/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/power/cpu.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/power/cpu.c 2010-12-31 14:46:53.000000000 -0500
@@ -129,7 +129,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
@@ -20704,7 +20182,7 @@ diff -urNp linux-2.6.32.27/arch/x86/power/cpu.c linux-2.6.32.27/arch/x86/power/c
#endif
diff -urNp linux-2.6.32.27/arch/x86/vdso/Makefile linux-2.6.32.27/arch/x86/vdso/Makefile
--- linux-2.6.32.27/arch/x86/vdso/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/vdso/Makefile 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/vdso/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -20716,7 +20194,7 @@ diff -urNp linux-2.6.32.27/arch/x86/vdso/Makefile linux-2.6.32.27/arch/x86/vdso/
#
diff -urNp linux-2.6.32.27/arch/x86/vdso/vclock_gettime.c linux-2.6.32.27/arch/x86/vdso/vclock_gettime.c
--- linux-2.6.32.27/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/vdso/vclock_gettime.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/vdso/vclock_gettime.c 2010-12-31 14:46:53.000000000 -0500
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
@@ -20817,7 +20295,7 @@ diff -urNp linux-2.6.32.27/arch/x86/vdso/vclock_gettime.c linux-2.6.32.27/arch/x
__attribute__((weak, alias("__vdso_gettimeofday")));
diff -urNp linux-2.6.32.27/arch/x86/vdso/vdso32-setup.c linux-2.6.32.27/arch/x86/vdso/vdso32-setup.c
--- linux-2.6.32.27/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/vdso/vdso32-setup.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/vdso/vdso32-setup.c 2010-12-31 14:46:53.000000000 -0500
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -20920,7 +20398,7 @@ diff -urNp linux-2.6.32.27/arch/x86/vdso/vdso32-setup.c linux-2.6.32.27/arch/x86
}
diff -urNp linux-2.6.32.27/arch/x86/vdso/vdso.lds.S linux-2.6.32.27/arch/x86/vdso/vdso.lds.S
--- linux-2.6.32.27/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/vdso/vdso.lds.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/vdso/vdso.lds.S 2010-12-31 14:46:53.000000000 -0500
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
#include "vextern.h"
@@ -20933,7 +20411,7 @@ diff -urNp linux-2.6.32.27/arch/x86/vdso/vdso.lds.S linux-2.6.32.27/arch/x86/vds
+#undef VEXTERN
diff -urNp linux-2.6.32.27/arch/x86/vdso/vextern.h linux-2.6.32.27/arch/x86/vdso/vextern.h
--- linux-2.6.32.27/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/vdso/vextern.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/vdso/vextern.h 2010-12-31 14:46:53.000000000 -0500
@@ -11,6 +11,5 @@
put into vextern.h and be referenced as a pointer with vdso prefix.
The main kernel later fills in the values. */
@@ -20943,7 +20421,7 @@ diff -urNp linux-2.6.32.27/arch/x86/vdso/vextern.h linux-2.6.32.27/arch/x86/vdso
VEXTERN(vsyscall_gtod_data)
diff -urNp linux-2.6.32.27/arch/x86/vdso/vma.c linux-2.6.32.27/arch/x86/vdso/vma.c
--- linux-2.6.32.27/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/vdso/vma.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/vdso/vma.c 2010-12-31 14:46:53.000000000 -0500
@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
@@ -20992,7 +20470,7 @@ diff -urNp linux-2.6.32.27/arch/x86/vdso/vma.c linux-2.6.32.27/arch/x86/vdso/vma
-__setup("vdso=", vdso_setup);
diff -urNp linux-2.6.32.27/arch/x86/xen/enlighten.c linux-2.6.32.27/arch/x86/xen/enlighten.c
--- linux-2.6.32.27/arch/x86/xen/enlighten.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/xen/enlighten.c 2010-12-09 18:30:30.000000000 -0500
++++ linux-2.6.32.27/arch/x86/xen/enlighten.c 2010-12-31 14:46:53.000000000 -0500
@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -21050,7 +20528,7 @@ diff -urNp linux-2.6.32.27/arch/x86/xen/enlighten.c linux-2.6.32.27/arch/x86/xen
pgd = (pgd_t *)xen_start_info->pt_base;
diff -urNp linux-2.6.32.27/arch/x86/xen/mmu.c linux-2.6.32.27/arch/x86/xen/mmu.c
--- linux-2.6.32.27/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/xen/mmu.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/xen/mmu.c 2010-12-31 14:46:53.000000000 -0500
@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
@@ -21073,7 +20551,7 @@ diff -urNp linux-2.6.32.27/arch/x86/xen/mmu.c linux-2.6.32.27/arch/x86/xen/mmu.c
diff -urNp linux-2.6.32.27/arch/x86/xen/smp.c linux-2.6.32.27/arch/x86/xen/smp.c
--- linux-2.6.32.27/arch/x86/xen/smp.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/arch/x86/xen/smp.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/xen/smp.c 2010-12-31 14:47:01.000000000 -0500
@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -21086,7 +20564,7 @@ diff -urNp linux-2.6.32.27/arch/x86/xen/smp.c linux-2.6.32.27/arch/x86/xen/smp.c
xen_setup_vcpu_info_placement();
}
-@@ -231,8 +226,8 @@ cpu_initialize_context(unsigned int cpu,
+@@ -231,12 +226,12 @@ cpu_initialize_context(unsigned int cpu,
gdt = get_cpu_gdt_table(cpu);
ctxt->flags = VGCF_IN_KERNEL;
@@ -21097,9 +20575,14 @@ diff -urNp linux-2.6.32.27/arch/x86/xen/smp.c linux-2.6.32.27/arch/x86/xen/smp.c
ctxt->user_regs.ss = __KERNEL_DS;
#ifdef CONFIG_X86_32
ctxt->user_regs.fs = __KERNEL_PERCPU;
+- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
++ savesegment(gs, ctxt->user_regs.gs);
+ #else
+ ctxt->gs_base_kernel = per_cpu_offset(cpu);
+ #endif
diff -urNp linux-2.6.32.27/arch/x86/xen/xen-head.S linux-2.6.32.27/arch/x86/xen/xen-head.S
--- linux-2.6.32.27/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/xen/xen-head.S 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/xen/xen-head.S 2010-12-31 14:46:53.000000000 -0500
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
@@ -21120,7 +20603,7 @@ diff -urNp linux-2.6.32.27/arch/x86/xen/xen-head.S linux-2.6.32.27/arch/x86/xen/
mov $init_thread_union+THREAD_SIZE,%rsp
diff -urNp linux-2.6.32.27/arch/x86/xen/xen-ops.h linux-2.6.32.27/arch/x86/xen/xen-ops.h
--- linux-2.6.32.27/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/arch/x86/xen/xen-ops.h 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/arch/x86/xen/xen-ops.h 2010-12-31 14:46:53.000000000 -0500
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -21132,7 +20615,7 @@ diff -urNp linux-2.6.32.27/arch/x86/xen/xen-ops.h linux-2.6.32.27/arch/x86/xen/x
diff -urNp linux-2.6.32.27/block/blk-integrity.c linux-2.6.32.27/block/blk-integrity.c
--- linux-2.6.32.27/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/block/blk-integrity.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/block/blk-integrity.c 2010-12-31 14:46:53.000000000 -0500
@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
NULL,
};
@@ -21144,7 +20627,7 @@ diff -urNp linux-2.6.32.27/block/blk-integrity.c linux-2.6.32.27/block/blk-integ
};
diff -urNp linux-2.6.32.27/block/blk-iopoll.c linux-2.6.32.27/block/blk-iopoll.c
--- linux-2.6.32.27/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/block/blk-iopoll.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/block/blk-iopoll.c 2010-12-31 14:46:53.000000000 -0500
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -21156,7 +20639,7 @@ diff -urNp linux-2.6.32.27/block/blk-iopoll.c linux-2.6.32.27/block/blk-iopoll.c
int rearm = 0, budget = blk_iopoll_budget;
diff -urNp linux-2.6.32.27/block/blk-map.c linux-2.6.32.27/block/blk-map.c
--- linux-2.6.32.27/block/blk-map.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/block/blk-map.c 2010-12-09 18:30:30.000000000 -0500
++++ linux-2.6.32.27/block/blk-map.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
* direct dma. else, set up kernel bounce buffers
*/
@@ -21187,7 +20670,7 @@ diff -urNp linux-2.6.32.27/block/blk-map.c linux-2.6.32.27/block/blk-map.c
else
diff -urNp linux-2.6.32.27/block/blk-softirq.c linux-2.6.32.27/block/blk-softirq.c
--- linux-2.6.32.27/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/block/blk-softirq.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/block/blk-softirq.c 2010-12-31 14:46:53.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.
@@ -21199,7 +20682,7 @@ diff -urNp linux-2.6.32.27/block/blk-softirq.c linux-2.6.32.27/block/blk-softirq
diff -urNp linux-2.6.32.27/block/blk-sysfs.c linux-2.6.32.27/block/blk-sysfs.c
--- linux-2.6.32.27/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/block/blk-sysfs.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/block/blk-sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
kmem_cache_free(blk_requestq_cachep, q);
}
@@ -21211,7 +20694,7 @@ diff -urNp linux-2.6.32.27/block/blk-sysfs.c linux-2.6.32.27/block/blk-sysfs.c
};
diff -urNp linux-2.6.32.27/block/elevator.c linux-2.6.32.27/block/elevator.c
--- linux-2.6.32.27/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/block/elevator.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/block/elevator.c 2010-12-31 14:46:53.000000000 -0500
@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
return error;
}
@@ -21223,7 +20706,7 @@ diff -urNp linux-2.6.32.27/block/elevator.c linux-2.6.32.27/block/elevator.c
};
diff -urNp linux-2.6.32.27/crypto/lrw.c linux-2.6.32.27/crypto/lrw.c
--- linux-2.6.32.27/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/crypto/lrw.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/crypto/lrw.c 2010-12-31 14:46:53.000000000 -0500
@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
struct priv *ctx = crypto_tfm_ctx(parent);
struct crypto_cipher *child = ctx->child;
@@ -21235,7 +20718,7 @@ diff -urNp linux-2.6.32.27/crypto/lrw.c linux-2.6.32.27/crypto/lrw.c
crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
diff -urNp linux-2.6.32.27/Documentation/dontdiff linux-2.6.32.27/Documentation/dontdiff
--- linux-2.6.32.27/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/Documentation/dontdiff 2010-12-09 18:12:53.000000000 -0500
++++ linux-2.6.32.27/Documentation/dontdiff 2010-12-31 14:46:53.000000000 -0500
@@ -3,6 +3,7 @@
*.bin
*.cpio
@@ -21355,7 +20838,7 @@ diff -urNp linux-2.6.32.27/Documentation/dontdiff linux-2.6.32.27/Documentation/
+zoffset.h
diff -urNp linux-2.6.32.27/Documentation/kernel-parameters.txt linux-2.6.32.27/Documentation/kernel-parameters.txt
--- linux-2.6.32.27/Documentation/kernel-parameters.txt 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/Documentation/kernel-parameters.txt 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/Documentation/kernel-parameters.txt 2010-12-31 14:46:53.000000000 -0500
@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters.
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
@@ -21371,7 +20854,7 @@ diff -urNp linux-2.6.32.27/Documentation/kernel-parameters.txt linux-2.6.32.27/D
pcd. [PARIDE]
diff -urNp linux-2.6.32.27/drivers/acpi/acpi_pad.c linux-2.6.32.27/drivers/acpi/acpi_pad.c
--- linux-2.6.32.27/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/acpi_pad.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/acpi_pad.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,7 +30,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
@@ -21383,7 +20866,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/acpi_pad.c linux-2.6.32.27/drivers/acpi/
static DEFINE_MUTEX(isolated_cpus_lock);
diff -urNp linux-2.6.32.27/drivers/acpi/battery.c linux-2.6.32.27/drivers/acpi/battery.c
--- linux-2.6.32.27/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/battery.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/battery.c 2010-12-31 14:46:53.000000000 -0500
@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
@@ -21395,7 +20878,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/battery.c linux-2.6.32.27/drivers/acpi/b
} acpi_battery_file[] = {
diff -urNp linux-2.6.32.27/drivers/acpi/blacklist.c linux-2.6.32.27/drivers/acpi/blacklist.c
--- linux-2.6.32.27/drivers/acpi/blacklist.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/acpi/blacklist.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/blacklist.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
{"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
"Incorrect _ADR", 1},
@@ -21407,7 +20890,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/blacklist.c linux-2.6.32.27/drivers/acpi
#if CONFIG_ACPI_BLACKLIST_YEAR
diff -urNp linux-2.6.32.27/drivers/acpi/dock.c linux-2.6.32.27/drivers/acpi/dock.c
--- linux-2.6.32.27/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/dock.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/dock.c 2010-12-31 14:46:53.000000000 -0500
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
@@ -21428,7 +20911,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/dock.c linux-2.6.32.27/drivers/acpi/dock
struct dock_dependent_device *dd;
diff -urNp linux-2.6.32.27/drivers/acpi/osl.c linux-2.6.32.27/drivers/acpi/osl.c
--- linux-2.6.32.27/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/osl.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/osl.c 2010-12-31 14:46:53.000000000 -0500
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
@@ -21449,7 +20932,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/osl.c linux-2.6.32.27/drivers/acpi/osl.c
case 8:
diff -urNp linux-2.6.32.27/drivers/acpi/power_meter.c linux-2.6.32.27/drivers/acpi/power_meter.c
--- linux-2.6.32.27/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/power_meter.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/power_meter.c 2010-12-31 14:46:53.000000000 -0500
@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
return res;
@@ -21461,7 +20944,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/power_meter.c linux-2.6.32.27/drivers/ac
resource->trip[attr->index - 7] = temp;
diff -urNp linux-2.6.32.27/drivers/acpi/proc.c linux-2.6.32.27/drivers/acpi/proc.c
--- linux-2.6.32.27/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/proc.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
@@ -21499,7 +20982,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/proc.c linux-2.6.32.27/drivers/acpi/proc
found_dev = dev;
diff -urNp linux-2.6.32.27/drivers/acpi/processor_core.c linux-2.6.32.27/drivers/acpi/processor_core.c
--- linux-2.6.32.27/drivers/acpi/processor_core.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/processor_core.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/processor_core.c 2010-12-31 14:46:53.000000000 -0500
@@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(
return 0;
}
@@ -21511,7 +20994,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/processor_core.c linux-2.6.32.27/drivers
* Buggy BIOS check
diff -urNp linux-2.6.32.27/drivers/acpi/processor_idle.c linux-2.6.32.27/drivers/acpi/processor_idle.c
--- linux-2.6.32.27/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/processor_idle.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/processor_idle.c 2010-12-31 14:46:53.000000000 -0500
@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -21523,7 +21006,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/processor_idle.c linux-2.6.32.27/drivers
diff -urNp linux-2.6.32.27/drivers/acpi/sbshc.c linux-2.6.32.27/drivers/acpi/sbshc.c
--- linux-2.6.32.27/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/sbshc.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/sbshc.c 2010-12-31 14:46:53.000000000 -0500
@@ -17,7 +17,7 @@
#define PREFIX "ACPI: "
@@ -21535,7 +21018,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/sbshc.c linux-2.6.32.27/drivers/acpi/sbs
struct acpi_smb_hc {
diff -urNp linux-2.6.32.27/drivers/acpi/sleep.c linux-2.6.32.27/drivers/acpi/sleep.c
--- linux-2.6.32.27/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/sleep.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
}
}
@@ -21574,7 +21057,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/sleep.c linux-2.6.32.27/drivers/acpi/sle
.pre_snapshot = acpi_hibernation_pre_snapshot_old,
diff -urNp linux-2.6.32.27/drivers/acpi/video.c linux-2.6.32.27/drivers/acpi/video.c
--- linux-2.6.32.27/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/acpi/video.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/acpi/video.c 2010-12-31 14:46:53.000000000 -0500
@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
vd->brightness->levels[request_level]);
}
@@ -21586,7 +21069,7 @@ diff -urNp linux-2.6.32.27/drivers/acpi/video.c linux-2.6.32.27/drivers/acpi/vid
};
diff -urNp linux-2.6.32.27/drivers/ata/ahci.c linux-2.6.32.27/drivers/ata/ahci.c
--- linux-2.6.32.27/drivers/ata/ahci.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/ata/ahci.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/ahci.c 2010-12-31 14:46:53.000000000 -0500
@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
.sdev_attrs = ahci_sdev_attrs,
};
@@ -21628,7 +21111,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/ahci.c linux-2.6.32.27/drivers/ata/ahci.c
diff -urNp linux-2.6.32.27/drivers/ata/ata_generic.c linux-2.6.32.27/drivers/ata/ata_generic.c
--- linux-2.6.32.27/drivers/ata/ata_generic.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/ata/ata_generic.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/ata_generic.c 2010-12-31 14:46:53.000000000 -0500
@@ -104,7 +104,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21640,7 +21123,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/ata_generic.c linux-2.6.32.27/drivers/ata
.set_mode = generic_set_mode,
diff -urNp linux-2.6.32.27/drivers/ata/ata_piix.c linux-2.6.32.27/drivers/ata/ata_piix.c
--- linux-2.6.32.27/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/ata_piix.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/ata_piix.c 2010-12-31 14:46:53.000000000 -0500
@@ -300,7 +300,7 @@ static const struct pci_device_id piix_p
{ 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (CPT) */
@@ -21706,7 +21189,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/ata_piix.c linux-2.6.32.27/drivers/ata/at
"Tecra M3,",
diff -urNp linux-2.6.32.27/drivers/ata/libata-acpi.c linux-2.6.32.27/drivers/ata/libata-acpi.c
--- linux-2.6.32.27/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/libata-acpi.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/libata-acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
@@ -21724,7 +21207,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/libata-acpi.c linux-2.6.32.27/drivers/ata
};
diff -urNp linux-2.6.32.27/drivers/ata/libata-core.c linux-2.6.32.27/drivers/ata/libata-core.c
--- linux-2.6.32.27/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/libata-core.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/libata-core.c 2010-12-31 14:46:53.000000000 -0500
@@ -900,7 +900,7 @@ static const struct ata_xfer_ent {
{ ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
{ ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -21818,7 +21301,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/libata-core.c linux-2.6.32.27/drivers/ata
.error_handler = ata_dummy_error_handler,
diff -urNp linux-2.6.32.27/drivers/ata/libata-eh.c linux-2.6.32.27/drivers/ata/libata-eh.c
--- linux-2.6.32.27/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/libata-eh.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/libata-eh.c 2010-12-31 14:46:53.000000000 -0500
@@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_
*/
void ata_std_error_handler(struct ata_port *ap)
@@ -21830,7 +21313,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/libata-eh.c linux-2.6.32.27/drivers/ata/l
/* ignore built-in hardreset if SCR access is not available */
diff -urNp linux-2.6.32.27/drivers/ata/libata-pmp.c linux-2.6.32.27/drivers/ata/libata-pmp.c
--- linux-2.6.32.27/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/libata-pmp.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/libata-pmp.c 2010-12-31 14:46:53.000000000 -0500
@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -21842,7 +21325,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/libata-pmp.c linux-2.6.32.27/drivers/ata/
struct ata_device *pmp_dev = pmp_link->device;
diff -urNp linux-2.6.32.27/drivers/ata/pata_acpi.c linux-2.6.32.27/drivers/ata/pata_acpi.c
--- linux-2.6.32.27/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_acpi.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21854,7 +21337,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_acpi.c linux-2.6.32.27/drivers/ata/p
.cable_detect = pacpi_cable_detect,
diff -urNp linux-2.6.32.27/drivers/ata/pata_ali.c linux-2.6.32.27/drivers/ata/pata_ali.c
--- linux-2.6.32.27/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_ali.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_ali.c 2010-12-31 14:46:53.000000000 -0500
@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
* Port operations for PIO only ALi
*/
@@ -21902,7 +21385,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_ali.c linux-2.6.32.27/drivers/ata/pa
.dev_config = ali_warn_atapi_dma,
diff -urNp linux-2.6.32.27/drivers/ata/pata_amd.c linux-2.6.32.27/drivers/ata/pata_amd.c
--- linux-2.6.32.27/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_amd.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_amd.c 2010-12-31 14:46:53.000000000 -0500
@@ -397,28 +397,28 @@ static const struct ata_port_operations
.prereset = amd_pre_reset,
};
@@ -21954,7 +21437,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_amd.c linux-2.6.32.27/drivers/ata/pa
.set_dmamode = nv133_set_dmamode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_artop.c linux-2.6.32.27/drivers/ata/pata_artop.c
--- linux-2.6.32.27/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_artop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_artop.c 2010-12-31 14:46:53.000000000 -0500
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21975,7 +21458,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_artop.c linux-2.6.32.27/drivers/ata/
.set_piomode = artop6260_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_at32.c linux-2.6.32.27/drivers/ata/pata_at32.c
--- linux-2.6.32.27/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_at32.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_at32.c 2010-12-31 14:46:53.000000000 -0500
@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21987,7 +21470,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_at32.c linux-2.6.32.27/drivers/ata/p
.set_piomode = pata_at32_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_at91.c linux-2.6.32.27/drivers/ata/pata_at91.c
--- linux-2.6.32.27/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_at91.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_at91.c 2010-12-31 14:46:53.000000000 -0500
@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
@@ -21999,7 +21482,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_at91.c linux-2.6.32.27/drivers/ata/p
.sff_data_xfer = pata_at91_data_xfer_noirq,
diff -urNp linux-2.6.32.27/drivers/ata/pata_atiixp.c linux-2.6.32.27/drivers/ata/pata_atiixp.c
--- linux-2.6.32.27/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_atiixp.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_atiixp.c 2010-12-31 14:46:53.000000000 -0500
@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -22011,7 +21494,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_atiixp.c linux-2.6.32.27/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
diff -urNp linux-2.6.32.27/drivers/ata/pata_atp867x.c linux-2.6.32.27/drivers/ata/pata_atp867x.c
--- linux-2.6.32.27/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_atp867x.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_atp867x.c 2010-12-31 14:46:53.000000000 -0500
@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22023,7 +21506,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_atp867x.c linux-2.6.32.27/drivers/at
.set_piomode = atp867x_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_bf54x.c linux-2.6.32.27/drivers/ata/pata_bf54x.c
--- linux-2.6.32.27/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_bf54x.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_bf54x.c 2010-12-31 14:46:53.000000000 -0500
@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22035,7 +21518,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_bf54x.c linux-2.6.32.27/drivers/ata/
.set_piomode = bfin_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_cmd640.c linux-2.6.32.27/drivers/ata/pata_cmd640.c
--- linux-2.6.32.27/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_cmd640.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_cmd640.c 2010-12-31 14:46:53.000000000 -0500
@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22047,7 +21530,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_cmd640.c linux-2.6.32.27/drivers/ata
.sff_data_xfer = ata_sff_data_xfer_noirq,
diff -urNp linux-2.6.32.27/drivers/ata/pata_cmd64x.c linux-2.6.32.27/drivers/ata/pata_cmd64x.c
--- linux-2.6.32.27/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_cmd64x.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_cmd64x.c 2010-12-31 14:46:53.000000000 -0500
@@ -275,18 +275,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
@@ -22072,7 +21555,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_cmd64x.c linux-2.6.32.27/drivers/ata
.cable_detect = cmd648_cable_detect,
diff -urNp linux-2.6.32.27/drivers/ata/pata_cs5520.c linux-2.6.32.27/drivers/ata/pata_cs5520.c
--- linux-2.6.32.27/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_cs5520.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_cs5520.c 2010-12-31 14:46:53.000000000 -0500
@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -22084,7 +21567,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_cs5520.c linux-2.6.32.27/drivers/ata
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.27/drivers/ata/pata_cs5530.c linux-2.6.32.27/drivers/ata/pata_cs5530.c
--- linux-2.6.32.27/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_cs5530.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_cs5530.c 2010-12-31 14:46:53.000000000 -0500
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -22096,7 +21579,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_cs5530.c linux-2.6.32.27/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
diff -urNp linux-2.6.32.27/drivers/ata/pata_cs5535.c linux-2.6.32.27/drivers/ata/pata_cs5535.c
--- linux-2.6.32.27/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_cs5535.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_cs5535.c 2010-12-31 14:46:53.000000000 -0500
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22108,7 +21591,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_cs5535.c linux-2.6.32.27/drivers/ata
.set_piomode = cs5535_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_cs5536.c linux-2.6.32.27/drivers/ata/pata_cs5536.c
--- linux-2.6.32.27/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_cs5536.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_cs5536.c 2010-12-31 14:46:53.000000000 -0500
@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22120,7 +21603,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_cs5536.c linux-2.6.32.27/drivers/ata
.set_piomode = cs5536_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_cypress.c linux-2.6.32.27/drivers/ata/pata_cypress.c
--- linux-2.6.32.27/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_cypress.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_cypress.c 2010-12-31 14:46:53.000000000 -0500
@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22132,7 +21615,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_cypress.c linux-2.6.32.27/drivers/at
.set_piomode = cy82c693_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_efar.c linux-2.6.32.27/drivers/ata/pata_efar.c
--- linux-2.6.32.27/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_efar.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_efar.c 2010-12-31 14:46:53.000000000 -0500
@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22144,7 +21627,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_efar.c linux-2.6.32.27/drivers/ata/p
.set_piomode = efar_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_hpt366.c linux-2.6.32.27/drivers/ata/pata_hpt366.c
--- linux-2.6.32.27/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_hpt366.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_hpt366.c 2010-12-31 14:46:53.000000000 -0500
@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
@@ -22156,7 +21639,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_hpt366.c linux-2.6.32.27/drivers/ata
.mode_filter = hpt366_filter,
diff -urNp linux-2.6.32.27/drivers/ata/pata_hpt37x.c linux-2.6.32.27/drivers/ata/pata_hpt37x.c
--- linux-2.6.32.27/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_hpt37x.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_hpt37x.c 2010-12-31 14:46:53.000000000 -0500
@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
@@ -22195,7 +21678,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_hpt37x.c linux-2.6.32.27/drivers/ata
};
diff -urNp linux-2.6.32.27/drivers/ata/pata_hpt3x2n.c linux-2.6.32.27/drivers/ata/pata_hpt3x2n.c
--- linux-2.6.32.27/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_hpt3x2n.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_hpt3x2n.c 2010-12-31 14:46:53.000000000 -0500
@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT3x2n.
*/
@@ -22207,7 +21690,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_hpt3x2n.c linux-2.6.32.27/drivers/at
.bmdma_stop = hpt3x2n_bmdma_stop,
diff -urNp linux-2.6.32.27/drivers/ata/pata_hpt3x3.c linux-2.6.32.27/drivers/ata/pata_hpt3x3.c
--- linux-2.6.32.27/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_hpt3x3.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_hpt3x3.c 2010-12-31 14:46:53.000000000 -0500
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22219,7 +21702,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_hpt3x3.c linux-2.6.32.27/drivers/ata
.set_piomode = hpt3x3_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_icside.c linux-2.6.32.27/drivers/ata/pata_icside.c
--- linux-2.6.32.27/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_icside.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_icside.c 2010-12-31 14:46:53.000000000 -0500
@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
}
}
@@ -22231,7 +21714,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_icside.c linux-2.6.32.27/drivers/ata
.qc_prep = ata_noop_qc_prep,
diff -urNp linux-2.6.32.27/drivers/ata/pata_isapnp.c linux-2.6.32.27/drivers/ata/pata_isapnp.c
--- linux-2.6.32.27/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_isapnp.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_isapnp.c 2010-12-31 14:46:53.000000000 -0500
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22249,7 +21732,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_isapnp.c linux-2.6.32.27/drivers/ata
/* No altstatus so we don't want to use the lost interrupt poll */
diff -urNp linux-2.6.32.27/drivers/ata/pata_it8213.c linux-2.6.32.27/drivers/ata/pata_it8213.c
--- linux-2.6.32.27/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_it8213.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_it8213.c 2010-12-31 14:46:53.000000000 -0500
@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
};
@@ -22261,7 +21744,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_it8213.c linux-2.6.32.27/drivers/ata
.set_piomode = it8213_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_it821x.c linux-2.6.32.27/drivers/ata/pata_it821x.c
--- linux-2.6.32.27/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_it821x.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_it821x.c 2010-12-31 14:46:53.000000000 -0500
@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22291,7 +21774,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_it821x.c linux-2.6.32.27/drivers/ata
.check_atapi_dma= it821x_check_atapi_dma,
diff -urNp linux-2.6.32.27/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.27/drivers/ata/pata_ixp4xx_cf.c
--- linux-2.6.32.27/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_ixp4xx_cf.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_ixp4xx_cf.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22303,7 +21786,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.27/drivers/
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.27/drivers/ata/pata_jmicron.c linux-2.6.32.27/drivers/ata/pata_jmicron.c
--- linux-2.6.32.27/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_jmicron.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_jmicron.c 2010-12-31 14:46:53.000000000 -0500
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22315,7 +21798,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_jmicron.c linux-2.6.32.27/drivers/at
};
diff -urNp linux-2.6.32.27/drivers/ata/pata_legacy.c linux-2.6.32.27/drivers/ata/pata_legacy.c
--- linux-2.6.32.27/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_legacy.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_legacy.c 2010-12-31 14:46:53.000000000 -0500
@@ -106,7 +106,7 @@ struct legacy_probe {
struct legacy_controller {
@@ -22429,7 +21912,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_legacy.c linux-2.6.32.27/drivers/ata
struct ata_port *ap;
diff -urNp linux-2.6.32.27/drivers/ata/pata_marvell.c linux-2.6.32.27/drivers/ata/pata_marvell.c
--- linux-2.6.32.27/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_marvell.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_marvell.c 2010-12-31 14:46:53.000000000 -0500
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22441,7 +21924,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_marvell.c linux-2.6.32.27/drivers/at
.prereset = marvell_pre_reset,
diff -urNp linux-2.6.32.27/drivers/ata/pata_mpc52xx.c linux-2.6.32.27/drivers/ata/pata_mpc52xx.c
--- linux-2.6.32.27/drivers/ata/pata_mpc52xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_mpc52xx.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_mpc52xx.c 2010-12-31 14:46:53.000000000 -0500
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
@@ -22453,7 +21936,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_mpc52xx.c linux-2.6.32.27/drivers/at
.set_piomode = mpc52xx_ata_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_mpiix.c linux-2.6.32.27/drivers/ata/pata_mpiix.c
--- linux-2.6.32.27/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_mpiix.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_mpiix.c 2010-12-31 14:46:53.000000000 -0500
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
@@ -22465,7 +21948,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_mpiix.c linux-2.6.32.27/drivers/ata/
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.27/drivers/ata/pata_netcell.c linux-2.6.32.27/drivers/ata/pata_netcell.c
--- linux-2.6.32.27/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_netcell.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_netcell.c 2010-12-31 14:46:53.000000000 -0500
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22477,7 +21960,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_netcell.c linux-2.6.32.27/drivers/at
.read_id = netcell_read_id,
diff -urNp linux-2.6.32.27/drivers/ata/pata_ninja32.c linux-2.6.32.27/drivers/ata/pata_ninja32.c
--- linux-2.6.32.27/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_ninja32.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_ninja32.c 2010-12-31 14:46:53.000000000 -0500
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22489,7 +21972,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_ninja32.c linux-2.6.32.27/drivers/at
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.27/drivers/ata/pata_ns87410.c linux-2.6.32.27/drivers/ata/pata_ns87410.c
--- linux-2.6.32.27/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_ns87410.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_ns87410.c 2010-12-31 14:46:53.000000000 -0500
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
ATA_PIO_SHT(DRV_NAME),
};
@@ -22501,7 +21984,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_ns87410.c linux-2.6.32.27/drivers/at
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.27/drivers/ata/pata_ns87415.c linux-2.6.32.27/drivers/ata/pata_ns87415.c
--- linux-2.6.32.27/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_ns87415.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_ns87415.c 2010-12-31 14:46:53.000000000 -0500
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
}
#endif /* 87560 SuperIO Support */
@@ -22522,7 +22005,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_ns87415.c linux-2.6.32.27/drivers/at
.sff_check_status = ns87560_check_status,
diff -urNp linux-2.6.32.27/drivers/ata/pata_octeon_cf.c linux-2.6.32.27/drivers/ata/pata_octeon_cf.c
--- linux-2.6.32.27/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_octeon_cf.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_octeon_cf.c 2010-12-31 14:46:53.000000000 -0500
@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
@@ -22533,7 +22016,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_octeon_cf.c linux-2.6.32.27/drivers/
.check_atapi_dma = octeon_cf_check_atapi_dma,
diff -urNp linux-2.6.32.27/drivers/ata/pata_oldpiix.c linux-2.6.32.27/drivers/ata/pata_oldpiix.c
--- linux-2.6.32.27/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_oldpiix.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_oldpiix.c 2010-12-31 14:46:53.000000000 -0500
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22545,7 +22028,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_oldpiix.c linux-2.6.32.27/drivers/at
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.27/drivers/ata/pata_opti.c linux-2.6.32.27/drivers/ata/pata_opti.c
--- linux-2.6.32.27/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_opti.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_opti.c 2010-12-31 14:46:53.000000000 -0500
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -22557,7 +22040,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_opti.c linux-2.6.32.27/drivers/ata/p
.set_piomode = opti_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_optidma.c linux-2.6.32.27/drivers/ata/pata_optidma.c
--- linux-2.6.32.27/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_optidma.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_optidma.c 2010-12-31 14:46:53.000000000 -0500
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22578,7 +22061,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_optidma.c linux-2.6.32.27/drivers/at
.set_dmamode = optiplus_set_dma_mode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_palmld.c linux-2.6.32.27/drivers/ata/pata_palmld.c
--- linux-2.6.32.27/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_palmld.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_palmld.c 2010-12-31 14:46:53.000000000 -0500
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22590,7 +22073,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_palmld.c linux-2.6.32.27/drivers/ata
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.27/drivers/ata/pata_pcmcia.c linux-2.6.32.27/drivers/ata/pata_pcmcia.c
--- linux-2.6.32.27/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_pcmcia.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_pcmcia.c 2010-12-31 14:46:53.000000000 -0500
@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22619,7 +22102,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_pcmcia.c linux-2.6.32.27/drivers/ata
if (info == NULL)
diff -urNp linux-2.6.32.27/drivers/ata/pata_pdc2027x.c linux-2.6.32.27/drivers/ata/pata_pdc2027x.c
--- linux-2.6.32.27/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_pdc2027x.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_pdc2027x.c 2010-12-31 14:46:53.000000000 -0500
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22639,7 +22122,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_pdc2027x.c linux-2.6.32.27/drivers/a
.set_piomode = pdc2027x_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.27/drivers/ata/pata_pdc202xx_old.c
--- linux-2.6.32.27/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_pdc202xx_old.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_pdc202xx_old.c 2010-12-31 14:46:53.000000000 -0500
@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22660,7 +22143,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.27/drive
.check_atapi_dma = pdc2026x_check_atapi_dma,
diff -urNp linux-2.6.32.27/drivers/ata/pata_platform.c linux-2.6.32.27/drivers/ata/pata_platform.c
--- linux-2.6.32.27/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_platform.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_platform.c 2010-12-31 14:46:53.000000000 -0500
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
ATA_PIO_SHT(DRV_NAME),
};
@@ -22672,7 +22155,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_platform.c linux-2.6.32.27/drivers/a
.cable_detect = ata_cable_unknown,
diff -urNp linux-2.6.32.27/drivers/ata/pata_qdi.c linux-2.6.32.27/drivers/ata/pata_qdi.c
--- linux-2.6.32.27/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_qdi.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_qdi.c 2010-12-31 14:46:53.000000000 -0500
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
ATA_PIO_SHT(DRV_NAME),
};
@@ -22693,7 +22176,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_qdi.c linux-2.6.32.27/drivers/ata/pa
};
diff -urNp linux-2.6.32.27/drivers/ata/pata_radisys.c linux-2.6.32.27/drivers/ata/pata_radisys.c
--- linux-2.6.32.27/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_radisys.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_radisys.c 2010-12-31 14:46:53.000000000 -0500
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22705,7 +22188,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_radisys.c linux-2.6.32.27/drivers/at
.cable_detect = ata_cable_unknown,
diff -urNp linux-2.6.32.27/drivers/ata/pata_rb532_cf.c linux-2.6.32.27/drivers/ata/pata_rb532_cf.c
--- linux-2.6.32.27/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_rb532_cf.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_rb532_cf.c 2010-12-31 14:46:53.000000000 -0500
@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
return IRQ_HANDLED;
}
@@ -22717,7 +22200,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_rb532_cf.c linux-2.6.32.27/drivers/a
};
diff -urNp linux-2.6.32.27/drivers/ata/pata_rdc.c linux-2.6.32.27/drivers/ata/pata_rdc.c
--- linux-2.6.32.27/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_rdc.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_rdc.c 2010-12-31 14:46:53.000000000 -0500
@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
pci_write_config_byte(dev, 0x48, udma_enable);
}
@@ -22729,7 +22212,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_rdc.c linux-2.6.32.27/drivers/ata/pa
.set_piomode = rdc_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_rz1000.c linux-2.6.32.27/drivers/ata/pata_rz1000.c
--- linux-2.6.32.27/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_rz1000.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_rz1000.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22741,7 +22224,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_rz1000.c linux-2.6.32.27/drivers/ata
.set_mode = rz1000_set_mode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_sc1200.c linux-2.6.32.27/drivers/ata/pata_sc1200.c
--- linux-2.6.32.27/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_sc1200.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_sc1200.c 2010-12-31 14:46:53.000000000 -0500
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -22753,7 +22236,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_sc1200.c linux-2.6.32.27/drivers/ata
.qc_issue = sc1200_qc_issue,
diff -urNp linux-2.6.32.27/drivers/ata/pata_scc.c linux-2.6.32.27/drivers/ata/pata_scc.c
--- linux-2.6.32.27/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_scc.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_scc.c 2010-12-31 14:46:53.000000000 -0500
@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22765,7 +22248,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_scc.c linux-2.6.32.27/drivers/ata/pa
.set_piomode = scc_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_sch.c linux-2.6.32.27/drivers/ata/pata_sch.c
--- linux-2.6.32.27/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_sch.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_sch.c 2010-12-31 14:46:53.000000000 -0500
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22777,7 +22260,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_sch.c linux-2.6.32.27/drivers/ata/pa
.set_piomode = sch_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_serverworks.c linux-2.6.32.27/drivers/ata/pata_serverworks.c
--- linux-2.6.32.27/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_serverworks.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_serverworks.c 2010-12-31 14:46:53.000000000 -0500
@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22798,7 +22281,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_serverworks.c linux-2.6.32.27/driver
};
diff -urNp linux-2.6.32.27/drivers/ata/pata_sil680.c linux-2.6.32.27/drivers/ata/pata_sil680.c
--- linux-2.6.32.27/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_sil680.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_sil680.c 2010-12-31 14:46:53.000000000 -0500
@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22810,7 +22293,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_sil680.c linux-2.6.32.27/drivers/ata
.set_piomode = sil680_set_piomode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_sis.c linux-2.6.32.27/drivers/ata/pata_sis.c
--- linux-2.6.32.27/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_sis.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_sis.c 2010-12-31 14:46:53.000000000 -0500
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22868,7 +22351,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_sis.c linux-2.6.32.27/drivers/ata/pa
.set_dmamode = sis_old_set_dmamode,
diff -urNp linux-2.6.32.27/drivers/ata/pata_sl82c105.c linux-2.6.32.27/drivers/ata/pata_sl82c105.c
--- linux-2.6.32.27/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_sl82c105.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_sl82c105.c 2010-12-31 14:46:53.000000000 -0500
@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22880,7 +22363,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_sl82c105.c linux-2.6.32.27/drivers/a
.bmdma_start = sl82c105_bmdma_start,
diff -urNp linux-2.6.32.27/drivers/ata/pata_triflex.c linux-2.6.32.27/drivers/ata/pata_triflex.c
--- linux-2.6.32.27/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_triflex.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_triflex.c 2010-12-31 14:46:53.000000000 -0500
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22892,7 +22375,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_triflex.c linux-2.6.32.27/drivers/at
.bmdma_stop = triflex_bmdma_stop,
diff -urNp linux-2.6.32.27/drivers/ata/pata_via.c linux-2.6.32.27/drivers/ata/pata_via.c
--- linux-2.6.32.27/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_via.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_via.c 2010-12-31 14:46:53.000000000 -0500
@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22913,7 +22396,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_via.c linux-2.6.32.27/drivers/ata/pa
};
diff -urNp linux-2.6.32.27/drivers/ata/pata_winbond.c linux-2.6.32.27/drivers/ata/pata_winbond.c
--- linux-2.6.32.27/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pata_winbond.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pata_winbond.c 2010-12-31 14:46:53.000000000 -0500
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
ATA_PIO_SHT(DRV_NAME),
};
@@ -22925,7 +22408,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pata_winbond.c linux-2.6.32.27/drivers/at
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.27/drivers/ata/pdc_adma.c linux-2.6.32.27/drivers/ata/pdc_adma.c
--- linux-2.6.32.27/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/pdc_adma.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/pdc_adma.c 2010-12-31 14:46:53.000000000 -0500
@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
.dma_boundary = ADMA_DMA_BOUNDARY,
};
@@ -22937,7 +22420,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/pdc_adma.c linux-2.6.32.27/drivers/ata/pd
.lost_interrupt = ATA_OP_NULL,
diff -urNp linux-2.6.32.27/drivers/ata/sata_fsl.c linux-2.6.32.27/drivers/ata/sata_fsl.c
--- linux-2.6.32.27/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_fsl.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_fsl.c 2010-12-31 14:46:53.000000000 -0500
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22949,7 +22432,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_fsl.c linux-2.6.32.27/drivers/ata/sa
.qc_defer = ata_std_qc_defer,
diff -urNp linux-2.6.32.27/drivers/ata/sata_inic162x.c linux-2.6.32.27/drivers/ata/sata_inic162x.c
--- linux-2.6.32.27/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_inic162x.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_inic162x.c 2010-12-31 14:46:53.000000000 -0500
@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
return 0;
}
@@ -22961,7 +22444,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_inic162x.c linux-2.6.32.27/drivers/a
.check_atapi_dma = inic_check_atapi_dma,
diff -urNp linux-2.6.32.27/drivers/ata/sata_mv.c linux-2.6.32.27/drivers/ata/sata_mv.c
--- linux-2.6.32.27/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_mv.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_mv.c 2010-12-31 14:46:53.000000000 -0500
@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
@@ -22991,7 +22474,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_mv.c linux-2.6.32.27/drivers/ata/sat
.qc_prep = mv_qc_prep_iie,
diff -urNp linux-2.6.32.27/drivers/ata/sata_nv.c linux-2.6.32.27/drivers/ata/sata_nv.c
--- linux-2.6.32.27/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_nv.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_nv.c 2010-12-31 14:46:53.000000000 -0500
@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
* cases. Define nv_hardreset() which only kicks in for post-boot
* probing and use it for all variants.
@@ -23036,7 +22519,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_nv.c linux-2.6.32.27/drivers/ata/sat
.qc_defer = ata_std_qc_defer,
diff -urNp linux-2.6.32.27/drivers/ata/sata_promise.c linux-2.6.32.27/drivers/ata/sata_promise.c
--- linux-2.6.32.27/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_promise.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_promise.c 2010-12-31 14:46:53.000000000 -0500
@@ -195,7 +195,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
@@ -23065,7 +22548,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_promise.c linux-2.6.32.27/drivers/at
.freeze = pdc_freeze,
diff -urNp linux-2.6.32.27/drivers/ata/sata_qstor.c linux-2.6.32.27/drivers/ata/sata_qstor.c
--- linux-2.6.32.27/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_qstor.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_qstor.c 2010-12-31 14:46:53.000000000 -0500
@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
@@ -23077,7 +22560,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_qstor.c linux-2.6.32.27/drivers/ata/
.check_atapi_dma = qs_check_atapi_dma,
diff -urNp linux-2.6.32.27/drivers/ata/sata_sil24.c linux-2.6.32.27/drivers/ata/sata_sil24.c
--- linux-2.6.32.27/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_sil24.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_sil24.c 2010-12-31 14:46:53.000000000 -0500
@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -23089,7 +22572,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_sil24.c linux-2.6.32.27/drivers/ata/
.qc_defer = sil24_qc_defer,
diff -urNp linux-2.6.32.27/drivers/ata/sata_sil.c linux-2.6.32.27/drivers/ata/sata_sil.c
--- linux-2.6.32.27/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_sil.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_sil.c 2010-12-31 14:46:53.000000000 -0500
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
.sg_tablesize = ATA_MAX_PRD
};
@@ -23101,7 +22584,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_sil.c linux-2.6.32.27/drivers/ata/sa
.set_mode = sil_set_mode,
diff -urNp linux-2.6.32.27/drivers/ata/sata_sis.c linux-2.6.32.27/drivers/ata/sata_sis.c
--- linux-2.6.32.27/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_sis.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_sis.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -23113,7 +22596,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_sis.c linux-2.6.32.27/drivers/ata/sa
.scr_write = sis_scr_write,
diff -urNp linux-2.6.32.27/drivers/ata/sata_svw.c linux-2.6.32.27/drivers/ata/sata_svw.c
--- linux-2.6.32.27/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_svw.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_svw.c 2010-12-31 14:46:53.000000000 -0500
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
@@ -23125,7 +22608,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_svw.c linux-2.6.32.27/drivers/ata/sa
.sff_tf_read = k2_sata_tf_read,
diff -urNp linux-2.6.32.27/drivers/ata/sata_sx4.c linux-2.6.32.27/drivers/ata/sata_sx4.c
--- linux-2.6.32.27/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_sx4.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_sx4.c 2010-12-31 14:46:53.000000000 -0500
@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
};
@@ -23137,7 +22620,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_sx4.c linux-2.6.32.27/drivers/ata/sa
.check_atapi_dma = pdc_check_atapi_dma,
diff -urNp linux-2.6.32.27/drivers/ata/sata_uli.c linux-2.6.32.27/drivers/ata/sata_uli.c
--- linux-2.6.32.27/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_uli.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_uli.c 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -23149,7 +22632,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_uli.c linux-2.6.32.27/drivers/ata/sa
.scr_write = uli_scr_write,
diff -urNp linux-2.6.32.27/drivers/ata/sata_via.c linux-2.6.32.27/drivers/ata/sata_via.c
--- linux-2.6.32.27/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_via.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_via.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -23189,7 +22672,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_via.c linux-2.6.32.27/drivers/ata/sa
.scr_read = vt8251_scr_read,
diff -urNp linux-2.6.32.27/drivers/ata/sata_vsc.c linux-2.6.32.27/drivers/ata/sata_vsc.c
--- linux-2.6.32.27/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ata/sata_vsc.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ata/sata_vsc.c 2010-12-31 14:46:53.000000000 -0500
@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
};
@@ -23201,7 +22684,7 @@ diff -urNp linux-2.6.32.27/drivers/ata/sata_vsc.c linux-2.6.32.27/drivers/ata/sa
cannot use the default lost interrupt handler */
diff -urNp linux-2.6.32.27/drivers/atm/adummy.c linux-2.6.32.27/drivers/atm/adummy.c
--- linux-2.6.32.27/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/adummy.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/adummy.c 2010-12-31 14:46:53.000000000 -0500
@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -23213,7 +22696,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/adummy.c linux-2.6.32.27/drivers/atm/adum
}
diff -urNp linux-2.6.32.27/drivers/atm/ambassador.c linux-2.6.32.27/drivers/atm/ambassador.c
--- linux-2.6.32.27/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/ambassador.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/ambassador.c 2010-12-31 14:46:53.000000000 -0500
@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -23252,7 +22735,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/ambassador.c linux-2.6.32.27/drivers/atm/
diff -urNp linux-2.6.32.27/drivers/atm/atmtcp.c linux-2.6.32.27/drivers/atm/atmtcp.c
--- linux-2.6.32.27/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/atmtcp.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/atmtcp.c 2010-12-31 14:46:53.000000000 -0500
@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
@@ -23304,7 +22787,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/atmtcp.c linux-2.6.32.27/drivers/atm/atmt
else dev_kfree_skb(skb);
diff -urNp linux-2.6.32.27/drivers/atm/eni.c linux-2.6.32.27/drivers/atm/eni.c
--- linux-2.6.32.27/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/eni.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/eni.c 2010-12-31 14:46:53.000000000 -0500
@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
vcc->dev->number);
@@ -23352,7 +22835,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/eni.c linux-2.6.32.27/drivers/atm/eni.c
}
diff -urNp linux-2.6.32.27/drivers/atm/firestream.c linux-2.6.32.27/drivers/atm/firestream.c
--- linux-2.6.32.27/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/firestream.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/firestream.c 2010-12-31 14:46:53.000000000 -0500
@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
}
}
@@ -23388,7 +22871,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/firestream.c linux-2.6.32.27/drivers/atm/
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
diff -urNp linux-2.6.32.27/drivers/atm/fore200e.c linux-2.6.32.27/drivers/atm/fore200e.c
--- linux-2.6.32.27/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/fore200e.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/fore200e.c 2010-12-31 14:46:53.000000000 -0500
@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -23447,7 +22930,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/fore200e.c linux-2.6.32.27/drivers/atm/fo
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
diff -urNp linux-2.6.32.27/drivers/atm/he.c linux-2.6.32.27/drivers/atm/he.c
--- linux-2.6.32.27/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/he.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/he.c 2010-12-31 14:46:53.000000000 -0500
@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -23531,7 +23014,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/he.c linux-2.6.32.27/drivers/atm/he.c
}
diff -urNp linux-2.6.32.27/drivers/atm/horizon.c linux-2.6.32.27/drivers/atm/horizon.c
--- linux-2.6.32.27/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/horizon.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/horizon.c 2010-12-31 14:46:53.000000000 -0500
@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -23552,7 +23035,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/horizon.c linux-2.6.32.27/drivers/atm/hor
hrz_kfree_skb (skb);
diff -urNp linux-2.6.32.27/drivers/atm/idt77252.c linux-2.6.32.27/drivers/atm/idt77252.c
--- linux-2.6.32.27/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/idt77252.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/idt77252.c 2010-12-31 14:46:53.000000000 -0500
@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -23709,7 +23192,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/idt77252.c linux-2.6.32.27/drivers/atm/id
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
diff -urNp linux-2.6.32.27/drivers/atm/iphase.c linux-2.6.32.27/drivers/atm/iphase.c
--- linux-2.6.32.27/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/iphase.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/iphase.c 2010-12-31 14:46:53.000000000 -0500
@@ -1123,7 +1123,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))
@@ -23808,7 +23291,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/iphase.c linux-2.6.32.27/drivers/atm/ipha
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
diff -urNp linux-2.6.32.27/drivers/atm/lanai.c linux-2.6.32.27/drivers/atm/lanai.c
--- linux-2.6.32.27/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/lanai.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/lanai.c 2010-12-31 14:46:53.000000000 -0500
@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
lanai_endtx(lanai, lvcc);
@@ -23865,7 +23348,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/lanai.c linux-2.6.32.27/drivers/atm/lanai
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
diff -urNp linux-2.6.32.27/drivers/atm/nicstar.c linux-2.6.32.27/drivers/atm/nicstar.c
--- linux-2.6.32.27/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/nicstar.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/nicstar.c 2010-12-31 14:46:53.000000000 -0500
@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL)
{
@@ -24070,7 +23553,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/nicstar.c linux-2.6.32.27/drivers/atm/nic
diff -urNp linux-2.6.32.27/drivers/atm/solos-pci.c linux-2.6.32.27/drivers/atm/solos-pci.c
--- linux-2.6.32.27/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/solos-pci.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/solos-pci.c 2010-12-31 14:46:53.000000000 -0500
@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -24091,7 +23574,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/solos-pci.c linux-2.6.32.27/drivers/atm/s
dev_kfree_skb_irq(oldskb);
diff -urNp linux-2.6.32.27/drivers/atm/suni.c linux-2.6.32.27/drivers/atm/suni.c
--- linux-2.6.32.27/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/suni.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/suni.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -24105,7 +23588,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/suni.c linux-2.6.32.27/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
diff -urNp linux-2.6.32.27/drivers/atm/uPD98402.c linux-2.6.32.27/drivers/atm/uPD98402.c
--- linux-2.6.32.27/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/uPD98402.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/uPD98402.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -24152,7 +23635,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/uPD98402.c linux-2.6.32.27/drivers/atm/uP
diff -urNp linux-2.6.32.27/drivers/atm/zatm.c linux-2.6.32.27/drivers/atm/zatm.c
--- linux-2.6.32.27/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/atm/zatm.c 2010-12-09 18:12:35.000000000 -0500
++++ linux-2.6.32.27/drivers/atm/zatm.c 2010-12-31 14:46:53.000000000 -0500
@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -24182,7 +23665,7 @@ diff -urNp linux-2.6.32.27/drivers/atm/zatm.c linux-2.6.32.27/drivers/atm/zatm.c
diff -urNp linux-2.6.32.27/drivers/base/bus.c linux-2.6.32.27/drivers/base/bus.c
--- linux-2.6.32.27/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/base/bus.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/base/bus.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
return ret;
}
@@ -24212,7 +23695,7 @@ diff -urNp linux-2.6.32.27/drivers/base/bus.c linux-2.6.32.27/drivers/base/bus.c
diff -urNp linux-2.6.32.27/drivers/base/class.c linux-2.6.32.27/drivers/base/class.c
--- linux-2.6.32.27/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/base/class.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/base/class.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,7 +63,7 @@ static void class_release(struct kobject
kfree(cp);
}
@@ -24224,7 +23707,7 @@ diff -urNp linux-2.6.32.27/drivers/base/class.c linux-2.6.32.27/drivers/base/cla
};
diff -urNp linux-2.6.32.27/drivers/base/core.c linux-2.6.32.27/drivers/base/core.c
--- linux-2.6.32.27/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/base/core.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/base/core.c 2010-12-31 14:46:53.000000000 -0500
@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
return ret;
}
@@ -24245,7 +23728,7 @@ diff -urNp linux-2.6.32.27/drivers/base/core.c linux-2.6.32.27/drivers/base/core
.uevent = dev_uevent,
diff -urNp linux-2.6.32.27/drivers/base/memory.c linux-2.6.32.27/drivers/base/memory.c
--- linux-2.6.32.27/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/base/memory.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/base/memory.c 2010-12-31 14:46:53.000000000 -0500
@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
return retval;
}
@@ -24257,7 +23740,7 @@ diff -urNp linux-2.6.32.27/drivers/base/memory.c linux-2.6.32.27/drivers/base/me
};
diff -urNp linux-2.6.32.27/drivers/base/sys.c linux-2.6.32.27/drivers/base/sys.c
--- linux-2.6.32.27/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/base/sys.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/base/sys.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
return -EIO;
}
@@ -24278,7 +23761,7 @@ diff -urNp linux-2.6.32.27/drivers/base/sys.c linux-2.6.32.27/drivers/base/sys.c
};
diff -urNp linux-2.6.32.27/drivers/block/cciss.c linux-2.6.32.27/drivers/block/cciss.c
--- linux-2.6.32.27/drivers/block/cciss.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/block/cciss.c 2010-12-18 20:01:28.000000000 -0500
++++ linux-2.6.32.27/drivers/block/cciss.c 2010-12-31 14:46:53.000000000 -0500
@@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
int err;
u32 cp;
@@ -24290,7 +23773,7 @@ diff -urNp linux-2.6.32.27/drivers/block/cciss.c linux-2.6.32.27/drivers/block/c
copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
diff -urNp linux-2.6.32.27/drivers/block/pktcdvd.c linux-2.6.32.27/drivers/block/pktcdvd.c
--- linux-2.6.32.27/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/block/pktcdvd.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/block/pktcdvd.c 2010-12-31 14:46:53.000000000 -0500
@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
return len;
}
@@ -24311,7 +23794,7 @@ diff -urNp linux-2.6.32.27/drivers/block/pktcdvd.c linux-2.6.32.27/drivers/block
return NULL;
diff -urNp linux-2.6.32.27/drivers/char/agp/frontend.c linux-2.6.32.27/drivers/char/agp/frontend.c
--- linux-2.6.32.27/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/agp/frontend.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/agp/frontend.c 2010-12-31 14:46:53.000000000 -0500
@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -24323,7 +23806,7 @@ diff -urNp linux-2.6.32.27/drivers/char/agp/frontend.c linux-2.6.32.27/drivers/c
client = agp_find_client_by_pid(reserve.pid);
diff -urNp linux-2.6.32.27/drivers/char/agp/intel-agp.c linux-2.6.32.27/drivers/char/agp/intel-agp.c
--- linux-2.6.32.27/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/agp/intel-agp.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/agp/intel-agp.c 2010-12-31 14:46:53.000000000 -0500
@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -24335,7 +23818,7 @@ diff -urNp linux-2.6.32.27/drivers/char/agp/intel-agp.c linux-2.6.32.27/drivers/
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
diff -urNp linux-2.6.32.27/drivers/char/hpet.c linux-2.6.32.27/drivers/char/hpet.c
--- linux-2.6.32.27/drivers/char/hpet.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/char/hpet.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hpet.c 2010-12-31 14:46:53.000000000 -0500
@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
return 0;
}
@@ -24379,7 +23862,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hpet.c linux-2.6.32.27/drivers/char/hpet
{
diff -urNp linux-2.6.32.27/drivers/char/hvc_beat.c linux-2.6.32.27/drivers/char/hvc_beat.c
--- linux-2.6.32.27/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_beat.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_beat.c 2010-12-31 14:46:53.000000000 -0500
@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
return cnt;
}
@@ -24391,7 +23874,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_beat.c linux-2.6.32.27/drivers/char/
};
diff -urNp linux-2.6.32.27/drivers/char/hvc_console.c linux-2.6.32.27/drivers/char/hvc_console.c
--- linux-2.6.32.27/drivers/char/hvc_console.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_console.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_console.c 2010-12-31 14:46:53.000000000 -0500
@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
* console interfaces but can still be used as a tty device. This has to be
* static because kmalloc will not work during early console init.
@@ -24421,7 +23904,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_console.c linux-2.6.32.27/drivers/ch
int i;
diff -urNp linux-2.6.32.27/drivers/char/hvc_console.h linux-2.6.32.27/drivers/char/hvc_console.h
--- linux-2.6.32.27/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_console.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_console.h 2010-12-31 14:46:53.000000000 -0500
@@ -55,7 +55,7 @@ struct hvc_struct {
int outbuf_size;
int n_outbuf;
@@ -24447,7 +23930,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_console.h linux-2.6.32.27/drivers/ch
diff -urNp linux-2.6.32.27/drivers/char/hvc_iseries.c linux-2.6.32.27/drivers/char/hvc_iseries.c
--- linux-2.6.32.27/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_iseries.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_iseries.c 2010-12-31 14:46:53.000000000 -0500
@@ -197,7 +197,7 @@ done:
return sent;
}
@@ -24459,7 +23942,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_iseries.c linux-2.6.32.27/drivers/ch
.notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.27/drivers/char/hvc_iucv.c linux-2.6.32.27/drivers/char/hvc_iucv.c
--- linux-2.6.32.27/drivers/char/hvc_iucv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_iucv.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_iucv.c 2010-12-31 14:46:53.000000000 -0500
@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
@@ -24471,7 +23954,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_iucv.c linux-2.6.32.27/drivers/char/
.notifier_add = hvc_iucv_notifier_add,
diff -urNp linux-2.6.32.27/drivers/char/hvc_rtas.c linux-2.6.32.27/drivers/char/hvc_rtas.c
--- linux-2.6.32.27/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_rtas.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_rtas.c 2010-12-31 14:46:53.000000000 -0500
@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
return i;
}
@@ -24483,7 +23966,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_rtas.c linux-2.6.32.27/drivers/char/
};
diff -urNp linux-2.6.32.27/drivers/char/hvcs.c linux-2.6.32.27/drivers/char/hvcs.c
--- linux-2.6.32.27/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvcs.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvcs.c 2010-12-31 14:46:53.000000000 -0500
@@ -269,7 +269,7 @@ struct hvcs_struct {
unsigned int index;
@@ -24580,7 +24063,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvcs.c linux-2.6.32.27/drivers/char/hvcs
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
diff -urNp linux-2.6.32.27/drivers/char/hvc_udbg.c linux-2.6.32.27/drivers/char/hvc_udbg.c
--- linux-2.6.32.27/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_udbg.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_udbg.c 2010-12-31 14:46:53.000000000 -0500
@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
return i;
}
@@ -24592,7 +24075,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_udbg.c linux-2.6.32.27/drivers/char/
};
diff -urNp linux-2.6.32.27/drivers/char/hvc_vio.c linux-2.6.32.27/drivers/char/hvc_vio.c
--- linux-2.6.32.27/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_vio.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_vio.c 2010-12-31 14:46:53.000000000 -0500
@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
return got;
}
@@ -24604,7 +24087,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_vio.c linux-2.6.32.27/drivers/char/h
.notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.27/drivers/char/hvc_xen.c linux-2.6.32.27/drivers/char/hvc_xen.c
--- linux-2.6.32.27/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/hvc_xen.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/hvc_xen.c 2010-12-31 14:46:53.000000000 -0500
@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
return recv;
}
@@ -24616,7 +24099,7 @@ diff -urNp linux-2.6.32.27/drivers/char/hvc_xen.c linux-2.6.32.27/drivers/char/h
.notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.27/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.27/drivers/char/ipmi/ipmi_msghandler.c
--- linux-2.6.32.27/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/ipmi/ipmi_msghandler.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/ipmi/ipmi_msghandler.c 2010-12-31 14:46:53.000000000 -0500
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -24649,7 +24132,7 @@ diff -urNp linux-2.6.32.27/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.27/d
diff -urNp linux-2.6.32.27/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.27/drivers/char/ipmi/ipmi_si_intf.c
--- linux-2.6.32.27/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/ipmi/ipmi_si_intf.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/ipmi/ipmi_si_intf.c 2010-12-31 14:46:53.000000000 -0500
@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -24682,7 +24165,7 @@ diff -urNp linux-2.6.32.27/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.27/driv
atomic_set(&new_smi->stop_operation, 0);
diff -urNp linux-2.6.32.27/drivers/char/keyboard.c linux-2.6.32.27/drivers/char/keyboard.c
--- linux-2.6.32.27/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/keyboard.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/keyboard.c 2010-12-31 14:46:53.000000000 -0500
@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
@@ -24711,7 +24194,7 @@ diff -urNp linux-2.6.32.27/drivers/char/keyboard.c linux-2.6.32.27/drivers/char/
MODULE_DEVICE_TABLE(input, kbd_ids);
diff -urNp linux-2.6.32.27/drivers/char/mem.c linux-2.6.32.27/drivers/char/mem.c
--- linux-2.6.32.27/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/mem.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/mem.c 2010-12-31 14:46:53.000000000 -0500
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -24890,7 +24373,7 @@ diff -urNp linux-2.6.32.27/drivers/char/mem.c linux-2.6.32.27/drivers/char/mem.c
static int memory_open(struct inode *inode, struct file *filp)
diff -urNp linux-2.6.32.27/drivers/char/nvram.c linux-2.6.32.27/drivers/char/nvram.c
--- linux-2.6.32.27/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/nvram.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/nvram.c 2010-12-31 14:46:53.000000000 -0500
@@ -435,7 +435,10 @@ static const struct file_operations nvra
static struct miscdevice nvram_dev = {
NVRAM_MINOR,
@@ -24905,7 +24388,7 @@ diff -urNp linux-2.6.32.27/drivers/char/nvram.c linux-2.6.32.27/drivers/char/nvr
static int __init nvram_init(void)
diff -urNp linux-2.6.32.27/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.27/drivers/char/pcmcia/ipwireless/tty.c
--- linux-2.6.32.27/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/pcmcia/ipwireless/tty.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/pcmcia/ipwireless/tty.c 2010-12-31 14:46:53.000000000 -0500
@@ -51,7 +51,7 @@ struct ipw_tty {
int tty_type;
struct ipw_network *network;
@@ -25022,7 +24505,7 @@ diff -urNp linux-2.6.32.27/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.27/
ttyj->channel_idx);
diff -urNp linux-2.6.32.27/drivers/char/pty.c linux-2.6.32.27/drivers/char/pty.c
--- linux-2.6.32.27/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/pty.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/pty.c 2010-12-31 14:46:53.000000000 -0500
@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
return ret;
}
@@ -25055,7 +24538,7 @@ diff -urNp linux-2.6.32.27/drivers/char/pty.c linux-2.6.32.27/drivers/char/pty.c
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
diff -urNp linux-2.6.32.27/drivers/char/random.c linux-2.6.32.27/drivers/char/random.c
--- linux-2.6.32.27/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/random.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/random.c 2010-12-31 14:46:53.000000000 -0500
@@ -254,8 +254,13 @@
/*
* Configuration information
@@ -25099,7 +24582,7 @@ diff -urNp linux-2.6.32.27/drivers/char/random.c linux-2.6.32.27/drivers/char/ra
diff -urNp linux-2.6.32.27/drivers/char/sonypi.c linux-2.6.32.27/drivers/char/sonypi.c
--- linux-2.6.32.27/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/sonypi.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/sonypi.c 2010-12-31 14:46:53.000000000 -0500
@@ -491,7 +491,7 @@ static struct sonypi_device {
spinlock_t fifo_lock;
wait_queue_head_t fifo_proc_list;
@@ -25132,7 +24615,7 @@ diff -urNp linux-2.6.32.27/drivers/char/sonypi.c linux-2.6.32.27/drivers/char/so
return 0;
diff -urNp linux-2.6.32.27/drivers/char/tpm/tpm_bios.c linux-2.6.32.27/drivers/char/tpm/tpm_bios.c
--- linux-2.6.32.27/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/tpm/tpm_bios.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/tpm/tpm_bios.c 2010-12-31 14:46:53.000000000 -0500
@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -25175,7 +24658,7 @@ diff -urNp linux-2.6.32.27/drivers/char/tpm/tpm_bios.c linux-2.6.32.27/drivers/c
diff -urNp linux-2.6.32.27/drivers/char/tty_io.c linux-2.6.32.27/drivers/char/tty_io.c
--- linux-2.6.32.27/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/tty_io.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/tty_io.c 2010-12-31 14:46:53.000000000 -0500
@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
@@ -25316,7 +24799,7 @@ diff -urNp linux-2.6.32.27/drivers/char/tty_io.c linux-2.6.32.27/drivers/char/tt
* we can't necessarily depend on lots of kernel help here.
diff -urNp linux-2.6.32.27/drivers/char/tty_ldisc.c linux-2.6.32.27/drivers/char/tty_ldisc.c
--- linux-2.6.32.27/drivers/char/tty_ldisc.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/char/tty_ldisc.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/char/tty_ldisc.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
struct tty_ldisc_ops *ldo = ld->ops;
@@ -25364,7 +24847,7 @@ diff -urNp linux-2.6.32.27/drivers/char/tty_ldisc.c linux-2.6.32.27/drivers/char
}
diff -urNp linux-2.6.32.27/drivers/char/virtio_console.c linux-2.6.32.27/drivers/char/virtio_console.c
--- linux-2.6.32.27/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/char/virtio_console.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/char/virtio_console.c 2010-12-31 14:46:53.000000000 -0500
@@ -44,6 +44,7 @@ static unsigned int in_len;
static char *in, *inbuf;
@@ -25375,7 +24858,7 @@ diff -urNp linux-2.6.32.27/drivers/char/virtio_console.c linux-2.6.32.27/drivers
/* The hvc device */
diff -urNp linux-2.6.32.27/drivers/char/vt_ioctl.c linux-2.6.32.27/drivers/char/vt_ioctl.c
--- linux-2.6.32.27/drivers/char/vt_ioctl.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/char/vt_ioctl.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/char/vt_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
@@ -25421,7 +24904,7 @@ diff -urNp linux-2.6.32.27/drivers/char/vt_ioctl.c linux-2.6.32.27/drivers/char/
goto reterr;
diff -urNp linux-2.6.32.27/drivers/cpufreq/cpufreq.c linux-2.6.32.27/drivers/cpufreq/cpufreq.c
--- linux-2.6.32.27/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/cpufreq/cpufreq.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/cpufreq/cpufreq.c 2010-12-31 14:46:53.000000000 -0500
@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
complete(&policy->kobj_unregister);
}
@@ -25433,7 +24916,7 @@ diff -urNp linux-2.6.32.27/drivers/cpufreq/cpufreq.c linux-2.6.32.27/drivers/cpu
};
diff -urNp linux-2.6.32.27/drivers/cpuidle/sysfs.c linux-2.6.32.27/drivers/cpuidle/sysfs.c
--- linux-2.6.32.27/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/cpuidle/sysfs.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/cpuidle/sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
return ret;
}
@@ -25463,7 +24946,7 @@ diff -urNp linux-2.6.32.27/drivers/cpuidle/sysfs.c linux-2.6.32.27/drivers/cpuid
wait_for_completion(&device->kobjs[i]->kobj_unregister);
diff -urNp linux-2.6.32.27/drivers/dma/ioat/dma.c linux-2.6.32.27/drivers/dma/ioat/dma.c
--- linux-2.6.32.27/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/dma/ioat/dma.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/dma/ioat/dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
return entry->show(&chan->common, page);
}
@@ -25475,7 +24958,7 @@ diff -urNp linux-2.6.32.27/drivers/dma/ioat/dma.c linux-2.6.32.27/drivers/dma/io
diff -urNp linux-2.6.32.27/drivers/dma/ioat/dma.h linux-2.6.32.27/drivers/dma/ioat/dma.h
--- linux-2.6.32.27/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/dma/ioat/dma.h 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/dma/ioat/dma.h 2010-12-31 14:46:53.000000000 -0500
@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
unsigned long *phys_complete);
void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -25487,7 +24970,7 @@ diff -urNp linux-2.6.32.27/drivers/dma/ioat/dma.h linux-2.6.32.27/drivers/dma/io
#endif /* IOATDMA_H */
diff -urNp linux-2.6.32.27/drivers/edac/edac_core.h linux-2.6.32.27/drivers/edac/edac_core.h
--- linux-2.6.32.27/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/edac/edac_core.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/edac/edac_core.h 2010-12-31 14:46:53.000000000 -0500
@@ -99,11 +99,11 @@ extern int edac_debug_level;
#else /* !CONFIG_EDAC_DEBUG */
@@ -25507,7 +24990,7 @@ diff -urNp linux-2.6.32.27/drivers/edac/edac_core.h linux-2.6.32.27/drivers/edac
diff -urNp linux-2.6.32.27/drivers/edac/edac_device_sysfs.c linux-2.6.32.27/drivers/edac/edac_device_sysfs.c
--- linux-2.6.32.27/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/edac/edac_device_sysfs.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/edac/edac_device_sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
}
@@ -25537,7 +25020,7 @@ diff -urNp linux-2.6.32.27/drivers/edac/edac_device_sysfs.c linux-2.6.32.27/driv
};
diff -urNp linux-2.6.32.27/drivers/edac/edac_mc_sysfs.c linux-2.6.32.27/drivers/edac/edac_mc_sysfs.c
--- linux-2.6.32.27/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/edac/edac_mc_sysfs.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/edac/edac_mc_sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
return -EIO;
}
@@ -25558,7 +25041,7 @@ diff -urNp linux-2.6.32.27/drivers/edac/edac_mc_sysfs.c linux-2.6.32.27/drivers/
};
diff -urNp linux-2.6.32.27/drivers/edac/edac_pci_sysfs.c linux-2.6.32.27/drivers/edac/edac_pci_sysfs.c
--- linux-2.6.32.27/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/edac/edac_pci_sysfs.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/edac/edac_pci_sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
}
@@ -25579,7 +25062,7 @@ diff -urNp linux-2.6.32.27/drivers/edac/edac_pci_sysfs.c linux-2.6.32.27/drivers
};
diff -urNp linux-2.6.32.27/drivers/firewire/core-cdev.c linux-2.6.32.27/drivers/firewire/core-cdev.c
--- linux-2.6.32.27/drivers/firewire/core-cdev.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/firewire/core-cdev.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/firewire/core-cdev.c 2010-12-31 14:46:53.000000000 -0500
@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
int ret;
@@ -25592,7 +25075,7 @@ diff -urNp linux-2.6.32.27/drivers/firewire/core-cdev.c linux-2.6.32.27/drivers/
r = kmalloc(sizeof(*r), GFP_KERNEL);
diff -urNp linux-2.6.32.27/drivers/firmware/dmi_scan.c linux-2.6.32.27/drivers/firmware/dmi_scan.c
--- linux-2.6.32.27/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/firmware/dmi_scan.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/firmware/dmi_scan.c 2010-12-31 14:46:53.000000000 -0500
@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -25607,7 +25090,7 @@ diff -urNp linux-2.6.32.27/drivers/firmware/dmi_scan.c linux-2.6.32.27/drivers/f
goto error;
diff -urNp linux-2.6.32.27/drivers/firmware/edd.c linux-2.6.32.27/drivers/firmware/edd.c
--- linux-2.6.32.27/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/firmware/edd.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/firmware/edd.c 2010-12-31 14:46:53.000000000 -0500
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
return ret;
}
@@ -25619,7 +25102,7 @@ diff -urNp linux-2.6.32.27/drivers/firmware/edd.c linux-2.6.32.27/drivers/firmwa
diff -urNp linux-2.6.32.27/drivers/firmware/efivars.c linux-2.6.32.27/drivers/firmware/efivars.c
--- linux-2.6.32.27/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/firmware/efivars.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/firmware/efivars.c 2010-12-31 14:46:53.000000000 -0500
@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
return ret;
}
@@ -25631,7 +25114,7 @@ diff -urNp linux-2.6.32.27/drivers/firmware/efivars.c linux-2.6.32.27/drivers/fi
};
diff -urNp linux-2.6.32.27/drivers/firmware/iscsi_ibft.c linux-2.6.32.27/drivers/firmware/iscsi_ibft.c
--- linux-2.6.32.27/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/firmware/iscsi_ibft.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/firmware/iscsi_ibft.c 2010-12-31 14:46:53.000000000 -0500
@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
return ret;
}
@@ -25643,7 +25126,7 @@ diff -urNp linux-2.6.32.27/drivers/firmware/iscsi_ibft.c linux-2.6.32.27/drivers
diff -urNp linux-2.6.32.27/drivers/firmware/memmap.c linux-2.6.32.27/drivers/firmware/memmap.c
--- linux-2.6.32.27/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/firmware/memmap.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/firmware/memmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
NULL
};
@@ -25655,7 +25138,7 @@ diff -urNp linux-2.6.32.27/drivers/firmware/memmap.c linux-2.6.32.27/drivers/fir
diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.27/drivers/gpu/drm/drm_crtc_helper.c
--- linux-2.6.32.27/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/drm_crtc_helper.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/drm_crtc_helper.c 2010-12-31 14:46:53.000000000 -0500
@@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d
struct drm_crtc *tmp;
int crtc_mask = 1;
@@ -25667,7 +25150,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.27/dri
diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_drv.c linux-2.6.32.27/drivers/gpu/drm/drm_drv.c
--- linux-2.6.32.27/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/drm_drv.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/drm_drv.c 2010-12-31 14:46:53.000000000 -0500
@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
char *kdata = NULL;
@@ -25679,7 +25162,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_drv.c linux-2.6.32.27/drivers/gpu
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_fops.c linux-2.6.32.27/drivers/gpu/drm/drm_fops.c
--- linux-2.6.32.27/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/drm_fops.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/drm_fops.c 2010-12-31 14:46:53.000000000 -0500
@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
}
@@ -25733,7 +25216,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_fops.c linux-2.6.32.27/drivers/gp
atomic_read(&dev->ioctl_count));
diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_info.c linux-2.6.32.27/drivers/gpu/drm/drm_info.c
--- linux-2.6.32.27/drivers/gpu/drm/drm_info.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/drm_info.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/drm_info.c 2010-12-31 14:46:53.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;
@@ -25764,7 +25247,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_info.c linux-2.6.32.27/drivers/gp
type = types[map->type];
diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.27/drivers/gpu/drm/drm_ioctl.c
--- linux-2.6.32.27/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/drm_ioctl.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/drm_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
stats->data[i].value =
(file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -25776,7 +25259,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.27/drivers/g
diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_lock.c linux-2.6.32.27/drivers/gpu/drm/drm_lock.c
--- linux-2.6.32.27/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/drm_lock.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/drm_lock.c 2010-12-31 14:46:53.000000000 -0500
@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
@@ -25797,7 +25280,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/drm_lock.c linux-2.6.32.27/drivers/gp
* modules but is required by the Sparc driver.
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.27/drivers/gpu/drm/i810/i810_dma.c
--- linux-2.6.32.27/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i810/i810_dma.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i810/i810_dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -25822,7 +25305,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.27/drive
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7017.c
--- linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7017.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7017.c 2010-12-31 14:46:53.000000000 -0500
@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
}
}
@@ -25834,7 +25317,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.27/dri
.mode_valid = ch7017_mode_valid,
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7xxx.c
--- linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-12-31 14:46:53.000000000 -0500
@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
}
}
@@ -25846,7 +25329,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.27/dri
.mode_valid = ch7xxx_mode_valid,
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo.h linux-2.6.32.27/drivers/gpu/drm/i915/dvo.h
--- linux-2.6.32.27/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo.h 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo.h 2010-12-31 14:46:53.000000000 -0500
@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
*
* \return singly-linked list of modes or NULL if no modes found.
@@ -25881,7 +25364,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo.h linux-2.6.32.27/drivers/gp
#endif /* _INTEL_DVO_H */
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ivch.c
--- linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ivch.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ivch.c 2010-12-31 14:46:53.000000000 -0500
@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
}
}
@@ -25893,7 +25376,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.27/drive
.save = ivch_save,
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.27/drivers/gpu/drm/i915/dvo_sil164.c
--- linux-2.6.32.27/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_sil164.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_sil164.c 2010-12-31 14:46:53.000000000 -0500
@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
}
}
@@ -25905,7 +25388,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.27/dri
.mode_valid = sil164_mode_valid,
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.27/drivers/gpu/drm/i915/dvo_tfp410.c
--- linux-2.6.32.27/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_tfp410.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i915/dvo_tfp410.c 2010-12-31 14:46:53.000000000 -0500
@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
}
}
@@ -25917,7 +25400,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.27/dri
.mode_valid = tfp410_mode_valid,
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.27/drivers/gpu/drm/i915/i915_drv.c
--- linux-2.6.32.27/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i915/i915_drv.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i915/i915_drv.c 2010-12-31 14:46:53.000000000 -0500
@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
return i915_resume(dev);
}
@@ -25929,7 +25412,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.27/drive
.close = drm_gem_vm_close,
diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.27/drivers/gpu/drm/i915/i915_gem.c
--- linux-2.6.32.27/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/i915/i915_gem.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/i915/i915_gem.c 2010-12-31 14:46:53.000000000 -0500
@@ -492,6 +492,11 @@ i915_gem_pread_ioctl(struct drm_device *
return -EINVAL;
}
@@ -25956,7 +25439,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.27/drive
* different detiling behavior between reading and writing.
diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.27/drivers/gpu/drm/radeon/mkregtable.c
--- linux-2.6.32.27/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/radeon/mkregtable.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/radeon/mkregtable.c 2010-12-31 14:46:53.000000000 -0500
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -25976,7 +25459,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.27/d
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_atombios.c
--- linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_atombios.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_atombios.c 2010-12-31 14:46:53.000000000 -0500
@@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o
}
}
@@ -26003,7 +25486,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_display.c
--- linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_display.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_display.c 2010-12-31 14:46:53.000000000 -0500
@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -26015,7 +25498,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
vco_diff = abs(vco - best_vco);
diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_state.c
--- linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_state.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_state.c 2010-12-31 14:46:53.000000000 -0500
@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -26027,7 +25510,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.27
diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_ttm.c
--- linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_ttm.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_ttm.c 2010-12-31 14:46:53.000000000 -0500
@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
@@ -26081,7 +25564,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.27/d
diff -urNp linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo.c
--- linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,7 +39,7 @@
#include <linux/module.h>
@@ -26102,7 +25585,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.27/drivers/
diff -urNp linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo_vm.c
--- linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
{
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -26125,7 +25608,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.27/drive
* between mmap_sem and bo_reserve: Perform a trylock operation
diff -urNp linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_global.c
--- linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_global.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_global.c 2010-12-31 14:46:53.000000000 -0500
@@ -36,7 +36,7 @@
struct ttm_global_item {
struct mutex mutex;
@@ -26185,7 +25668,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.27/driv
}
diff -urNp linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_memory.c
--- linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_memory.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_memory.c 2010-12-31 14:46:53.000000000 -0500
@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
NULL
};
@@ -26197,7 +25680,7 @@ diff -urNp linux-2.6.32.27/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.27/driv
};
diff -urNp linux-2.6.32.27/drivers/hid/usbhid/hiddev.c linux-2.6.32.27/drivers/hid/usbhid/hiddev.c
--- linux-2.6.32.27/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/hid/usbhid/hiddev.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/hid/usbhid/hiddev.c 2010-12-31 14:46:53.000000000 -0500
@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
return put_user(HID_VERSION, (int __user *)arg);
@@ -26209,7 +25692,7 @@ diff -urNp linux-2.6.32.27/drivers/hid/usbhid/hiddev.c linux-2.6.32.27/drivers/h
for (i = 0; i < hid->maxcollection; i++)
diff -urNp linux-2.6.32.27/drivers/hwmon/k8temp.c linux-2.6.32.27/drivers/hwmon/k8temp.c
--- linux-2.6.32.27/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/drivers/hwmon/k8temp.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/hwmon/k8temp.c 2010-12-31 14:46:53.000000000 -0500
@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
static struct pci_device_id k8temp_ids[] = {
@@ -26221,7 +25704,7 @@ diff -urNp linux-2.6.32.27/drivers/hwmon/k8temp.c linux-2.6.32.27/drivers/hwmon/
MODULE_DEVICE_TABLE(pci, k8temp_ids);
diff -urNp linux-2.6.32.27/drivers/hwmon/sis5595.c linux-2.6.32.27/drivers/hwmon/sis5595.c
--- linux-2.6.32.27/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/hwmon/sis5595.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/hwmon/sis5595.c 2010-12-31 14:46:53.000000000 -0500
@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
static struct pci_device_id sis5595_pci_ids[] = {
@@ -26233,7 +25716,7 @@ diff -urNp linux-2.6.32.27/drivers/hwmon/sis5595.c linux-2.6.32.27/drivers/hwmon
MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
diff -urNp linux-2.6.32.27/drivers/hwmon/via686a.c linux-2.6.32.27/drivers/hwmon/via686a.c
--- linux-2.6.32.27/drivers/hwmon/via686a.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/hwmon/via686a.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/hwmon/via686a.c 2010-12-31 14:46:53.000000000 -0500
@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
static struct pci_device_id via686a_pci_ids[] = {
@@ -26245,7 +25728,7 @@ diff -urNp linux-2.6.32.27/drivers/hwmon/via686a.c linux-2.6.32.27/drivers/hwmon
MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
diff -urNp linux-2.6.32.27/drivers/hwmon/vt8231.c linux-2.6.32.27/drivers/hwmon/vt8231.c
--- linux-2.6.32.27/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/hwmon/vt8231.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/hwmon/vt8231.c 2010-12-31 14:46:53.000000000 -0500
@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
static struct pci_device_id vt8231_pci_ids[] = {
@@ -26257,7 +25740,7 @@ diff -urNp linux-2.6.32.27/drivers/hwmon/vt8231.c linux-2.6.32.27/drivers/hwmon/
MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
diff -urNp linux-2.6.32.27/drivers/hwmon/w83791d.c linux-2.6.32.27/drivers/hwmon/w83791d.c
--- linux-2.6.32.27/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/hwmon/w83791d.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/hwmon/w83791d.c 2010-12-31 14:46:53.000000000 -0500
@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
struct i2c_board_info *info);
static int w83791d_remove(struct i2c_client *client);
@@ -26271,7 +25754,7 @@ diff -urNp linux-2.6.32.27/drivers/hwmon/w83791d.c linux-2.6.32.27/drivers/hwmon
#ifdef DEBUG
diff -urNp linux-2.6.32.27/drivers/i2c/busses/i2c-i801.c linux-2.6.32.27/drivers/i2c/busses/i2c-i801.c
--- linux-2.6.32.27/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/i2c/busses/i2c-i801.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/i2c/busses/i2c-i801.c 2010-12-31 14:46:53.000000000 -0500
@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -26283,7 +25766,7 @@ diff -urNp linux-2.6.32.27/drivers/i2c/busses/i2c-i801.c linux-2.6.32.27/drivers
MODULE_DEVICE_TABLE (pci, i801_ids);
diff -urNp linux-2.6.32.27/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.27/drivers/i2c/busses/i2c-piix4.c
--- linux-2.6.32.27/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/i2c/busses/i2c-piix4.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/i2c/busses/i2c-piix4.c 2010-12-31 14:46:53.000000000 -0500
@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
.ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -26304,7 +25787,7 @@ diff -urNp linux-2.6.32.27/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.27/driver
MODULE_DEVICE_TABLE (pci, piix4_ids);
diff -urNp linux-2.6.32.27/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.27/drivers/i2c/busses/i2c-sis630.c
--- linux-2.6.32.27/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/i2c/busses/i2c-sis630.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/i2c/busses/i2c-sis630.c 2010-12-31 14:46:53.000000000 -0500
@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
static struct pci_device_id sis630_ids[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -26316,7 +25799,7 @@ diff -urNp linux-2.6.32.27/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.27/drive
MODULE_DEVICE_TABLE (pci, sis630_ids);
diff -urNp linux-2.6.32.27/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.27/drivers/i2c/busses/i2c-sis96x.c
--- linux-2.6.32.27/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/i2c/busses/i2c-sis96x.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/i2c/busses/i2c-sis96x.c 2010-12-31 14:46:53.000000000 -0500
@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
static struct pci_device_id sis96x_ids[] = {
@@ -26328,7 +25811,7 @@ diff -urNp linux-2.6.32.27/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.27/drive
MODULE_DEVICE_TABLE (pci, sis96x_ids);
diff -urNp linux-2.6.32.27/drivers/ide/ide-cd.c linux-2.6.32.27/drivers/ide/ide-cd.c
--- linux-2.6.32.27/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ide/ide-cd.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/ide/ide-cd.c 2010-12-31 14:46:53.000000000 -0500
@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
@@ -26340,7 +25823,7 @@ diff -urNp linux-2.6.32.27/drivers/ide/ide-cd.c linux-2.6.32.27/drivers/ide/ide-
}
diff -urNp linux-2.6.32.27/drivers/ieee1394/dv1394.c linux-2.6.32.27/drivers/ieee1394/dv1394.c
--- linux-2.6.32.27/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ieee1394/dv1394.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ieee1394/dv1394.c 2010-12-31 14:46:53.000000000 -0500
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
@@ -26361,7 +25844,7 @@ diff -urNp linux-2.6.32.27/drivers/ieee1394/dv1394.c linux-2.6.32.27/drivers/iee
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
diff -urNp linux-2.6.32.27/drivers/ieee1394/eth1394.c linux-2.6.32.27/drivers/ieee1394/eth1394.c
--- linux-2.6.32.27/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ieee1394/eth1394.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ieee1394/eth1394.c 2010-12-31 14:46:53.000000000 -0500
@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
.specifier_id = ETHER1394_GASP_SPECIFIER_ID,
.version = ETHER1394_GASP_VERSION,
@@ -26373,7 +25856,7 @@ diff -urNp linux-2.6.32.27/drivers/ieee1394/eth1394.c linux-2.6.32.27/drivers/ie
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
diff -urNp linux-2.6.32.27/drivers/ieee1394/hosts.c linux-2.6.32.27/drivers/ieee1394/hosts.c
--- linux-2.6.32.27/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ieee1394/hosts.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ieee1394/hosts.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
}
@@ -26384,7 +25867,7 @@ diff -urNp linux-2.6.32.27/drivers/ieee1394/hosts.c linux-2.6.32.27/drivers/ieee
.isoctl = dummy_isoctl
diff -urNp linux-2.6.32.27/drivers/ieee1394/ohci1394.c linux-2.6.32.27/drivers/ieee1394/ohci1394.c
--- linux-2.6.32.27/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ieee1394/ohci1394.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ieee1394/ohci1394.c 2010-12-31 14:46:53.000000000 -0500
@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
@@ -26408,7 +25891,7 @@ diff -urNp linux-2.6.32.27/drivers/ieee1394/ohci1394.c linux-2.6.32.27/drivers/i
MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
diff -urNp linux-2.6.32.27/drivers/ieee1394/raw1394.c linux-2.6.32.27/drivers/ieee1394/raw1394.c
--- linux-2.6.32.27/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ieee1394/raw1394.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ieee1394/raw1394.c 2010-12-31 14:46:53.000000000 -0500
@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -26420,7 +25903,7 @@ diff -urNp linux-2.6.32.27/drivers/ieee1394/raw1394.c linux-2.6.32.27/drivers/ie
MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
diff -urNp linux-2.6.32.27/drivers/ieee1394/sbp2.c linux-2.6.32.27/drivers/ieee1394/sbp2.c
--- linux-2.6.32.27/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ieee1394/sbp2.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ieee1394/sbp2.c 2010-12-31 14:46:53.000000000 -0500
@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -26441,7 +25924,7 @@ diff -urNp linux-2.6.32.27/drivers/ieee1394/sbp2.c linux-2.6.32.27/drivers/ieee1
diff -urNp linux-2.6.32.27/drivers/ieee1394/video1394.c linux-2.6.32.27/drivers/ieee1394/video1394.c
--- linux-2.6.32.27/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/ieee1394/video1394.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/ieee1394/video1394.c 2010-12-31 14:46:53.000000000 -0500
@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -26453,7 +25936,7 @@ diff -urNp linux-2.6.32.27/drivers/ieee1394/video1394.c linux-2.6.32.27/drivers/
MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
diff -urNp linux-2.6.32.27/drivers/infiniband/core/cm.c linux-2.6.32.27/drivers/infiniband/core/cm.c
--- linux-2.6.32.27/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/infiniband/core/cm.c 2010-12-09 18:12:36.000000000 -0500
++++ linux-2.6.32.27/drivers/infiniband/core/cm.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,7 +112,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -26599,7 +26082,7 @@ diff -urNp linux-2.6.32.27/drivers/infiniband/core/cm.c linux-2.6.32.27/drivers/
diff -urNp linux-2.6.32.27/drivers/infiniband/core/sysfs.c linux-2.6.32.27/drivers/infiniband/core/sysfs.c
--- linux-2.6.32.27/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/infiniband/core/sysfs.c 2010-12-09 18:12:36.000000000 -0500
++++ linux-2.6.32.27/drivers/infiniband/core/sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
return port_attr->show(p, port_attr, buf);
}
@@ -26611,7 +26094,7 @@ diff -urNp linux-2.6.32.27/drivers/infiniband/core/sysfs.c linux-2.6.32.27/drive
diff -urNp linux-2.6.32.27/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.27/drivers/infiniband/core/uverbs_marshall.c
--- linux-2.6.32.27/drivers/infiniband/core/uverbs_marshall.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/infiniband/core/uverbs_marshall.c 2010-12-09 18:12:36.000000000 -0500
++++ linux-2.6.32.27/drivers/infiniband/core/uverbs_marshall.c 2010-12-31 14:46:53.000000000 -0500
@@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u
dst->grh.sgid_index = src->grh.sgid_index;
dst->grh.hop_limit = src->grh.hop_limit;
@@ -26644,7 +26127,7 @@ diff -urNp linux-2.6.32.27/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3
diff -urNp linux-2.6.32.27/drivers/input/keyboard/atkbd.c linux-2.6.32.27/drivers/input/keyboard/atkbd.c
--- linux-2.6.32.27/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/input/keyboard/atkbd.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/input/keyboard/atkbd.c 2010-12-31 14:46:53.000000000 -0500
@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -26656,7 +26139,7 @@ diff -urNp linux-2.6.32.27/drivers/input/keyboard/atkbd.c linux-2.6.32.27/driver
MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
diff -urNp linux-2.6.32.27/drivers/input/mouse/lifebook.c linux-2.6.32.27/drivers/input/mouse/lifebook.c
--- linux-2.6.32.27/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/input/mouse/lifebook.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/input/mouse/lifebook.c 2010-12-31 14:46:53.000000000 -0500
@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
},
@@ -26668,7 +26151,7 @@ diff -urNp linux-2.6.32.27/drivers/input/mouse/lifebook.c linux-2.6.32.27/driver
static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
diff -urNp linux-2.6.32.27/drivers/input/mouse/psmouse-base.c linux-2.6.32.27/drivers/input/mouse/psmouse-base.c
--- linux-2.6.32.27/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/input/mouse/psmouse-base.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/input/mouse/psmouse-base.c 2010-12-31 14:46:53.000000000 -0500
@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -26680,7 +26163,7 @@ diff -urNp linux-2.6.32.27/drivers/input/mouse/psmouse-base.c linux-2.6.32.27/dr
MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
diff -urNp linux-2.6.32.27/drivers/input/mouse/synaptics.c linux-2.6.32.27/drivers/input/mouse/synaptics.c
--- linux-2.6.32.27/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/input/mouse/synaptics.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/input/mouse/synaptics.c 2010-12-31 14:46:53.000000000 -0500
@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
break;
case 2:
@@ -26711,7 +26194,7 @@ diff -urNp linux-2.6.32.27/drivers/input/mouse/synaptics.c linux-2.6.32.27/drive
diff -urNp linux-2.6.32.27/drivers/input/mousedev.c linux-2.6.32.27/drivers/input/mousedev.c
--- linux-2.6.32.27/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/input/mousedev.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/input/mousedev.c 2010-12-31 14:46:53.000000000 -0500
@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -26723,7 +26206,7 @@ diff -urNp linux-2.6.32.27/drivers/input/mousedev.c linux-2.6.32.27/drivers/inpu
#endif
diff -urNp linux-2.6.32.27/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.27/drivers/input/serio/i8042-x86ia64io.h
--- linux-2.6.32.27/drivers/input/serio/i8042-x86ia64io.h 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/input/serio/i8042-x86ia64io.h 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/input/serio/i8042-x86ia64io.h 2010-12-31 14:46:53.000000000 -0500
@@ -179,7 +179,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
@@ -26780,7 +26263,7 @@ diff -urNp linux-2.6.32.27/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.27
#endif /* CONFIG_X86 */
diff -urNp linux-2.6.32.27/drivers/input/serio/serio_raw.c linux-2.6.32.27/drivers/input/serio/serio_raw.c
--- linux-2.6.32.27/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/input/serio/serio_raw.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/input/serio/serio_raw.c 2010-12-31 14:46:53.000000000 -0500
@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -26792,7 +26275,7 @@ diff -urNp linux-2.6.32.27/drivers/input/serio/serio_raw.c linux-2.6.32.27/drive
MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
diff -urNp linux-2.6.32.27/drivers/isdn/gigaset/common.c linux-2.6.32.27/drivers/isdn/gigaset/common.c
--- linux-2.6.32.27/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/isdn/gigaset/common.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/isdn/gigaset/common.c 2010-12-31 14:46:53.000000000 -0500
@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -26804,7 +26287,7 @@ diff -urNp linux-2.6.32.27/drivers/isdn/gigaset/common.c linux-2.6.32.27/drivers
cs->tty_dev = NULL;
diff -urNp linux-2.6.32.27/drivers/isdn/gigaset/gigaset.h linux-2.6.32.27/drivers/isdn/gigaset/gigaset.h
--- linux-2.6.32.27/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/isdn/gigaset/gigaset.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/isdn/gigaset/gigaset.h 2010-12-31 14:46:53.000000000 -0500
@@ -446,7 +446,7 @@ struct cardstate {
spinlock_t cmdlock;
unsigned curlen, cmdbytes;
@@ -26816,7 +26299,7 @@ diff -urNp linux-2.6.32.27/drivers/isdn/gigaset/gigaset.h linux-2.6.32.27/driver
unsigned control_state;
diff -urNp linux-2.6.32.27/drivers/isdn/gigaset/interface.c linux-2.6.32.27/drivers/isdn/gigaset/interface.c
--- linux-2.6.32.27/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/isdn/gigaset/interface.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/isdn/gigaset/interface.c 2010-12-31 14:46:53.000000000 -0500
@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS; // FIXME -EINTR?
tty->driver_data = cs;
@@ -26906,7 +26389,7 @@ diff -urNp linux-2.6.32.27/drivers/isdn/gigaset/interface.c linux-2.6.32.27/driv
}
diff -urNp linux-2.6.32.27/drivers/isdn/hardware/avm/b1.c linux-2.6.32.27/drivers/isdn/hardware/avm/b1.c
--- linux-2.6.32.27/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/isdn/hardware/avm/b1.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/isdn/hardware/avm/b1.c 2010-12-31 14:46:53.000000000 -0500
@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -26927,7 +26410,7 @@ diff -urNp linux-2.6.32.27/drivers/isdn/hardware/avm/b1.c linux-2.6.32.27/driver
memcpy(buf, dp, left);
diff -urNp linux-2.6.32.27/drivers/isdn/icn/icn.c linux-2.6.32.27/drivers/isdn/icn/icn.c
--- linux-2.6.32.27/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/isdn/icn/icn.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/isdn/icn/icn.c 2010-12-31 14:46:53.000000000 -0500
@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -26939,7 +26422,7 @@ diff -urNp linux-2.6.32.27/drivers/isdn/icn/icn.c linux-2.6.32.27/drivers/isdn/i
memcpy(msg, buf, count);
diff -urNp linux-2.6.32.27/drivers/isdn/mISDN/socket.c linux-2.6.32.27/drivers/isdn/mISDN/socket.c
--- linux-2.6.32.27/drivers/isdn/mISDN/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/isdn/mISDN/socket.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/isdn/mISDN/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns
if (dev) {
struct mISDN_devinfo di;
@@ -26958,7 +26441,7 @@ diff -urNp linux-2.6.32.27/drivers/isdn/mISDN/socket.c linux-2.6.32.27/drivers/i
di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
diff -urNp linux-2.6.32.27/drivers/isdn/sc/interrupt.c linux-2.6.32.27/drivers/isdn/sc/interrupt.c
--- linux-2.6.32.27/drivers/isdn/sc/interrupt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/isdn/sc/interrupt.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/isdn/sc/interrupt.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
}
else if(callid>=0x0000 && callid<=0x7FFF)
@@ -26995,7 +26478,7 @@ diff -urNp linux-2.6.32.27/drivers/isdn/sc/interrupt.c linux-2.6.32.27/drivers/i
diff -urNp linux-2.6.32.27/drivers/lguest/core.c linux-2.6.32.27/drivers/lguest/core.c
--- linux-2.6.32.27/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/lguest/core.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/lguest/core.c 2010-12-31 14:46:53.000000000 -0500
@@ -91,9 +91,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.
@@ -27023,9 +26506,114 @@ diff -urNp linux-2.6.32.27/drivers/lguest/core.c linux-2.6.32.27/drivers/lguest/
end_switcher_text - start_switcher_text);
printk(KERN_INFO "lguest: mapped switcher at %p\n",
+diff -urNp linux-2.6.32.27/drivers/lguest/x86/core.c linux-2.6.32.27/drivers/lguest/x86/core.c
+--- linux-2.6.32.27/drivers/lguest/x86/core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/drivers/lguest/x86/core.c 2010-12-31 14:47:01.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)
+ {
+- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
++ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
+ }
+
+ /* This cpu's struct lguest_pages. */
+@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg
+ * These copies are pretty cheap, so we do them unconditionally: */
+ /* Save the current Host top-level page directory.
+ */
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++ pages->state.host_cr3 = read_cr3();
++#else
+ pages->state.host_cr3 = __pa(current->mm->pgd);
++#endif
++
+ /*
+ * Set up the Guest's page tables to see this CPU's pages (and no
+ * other CPU's pages).
+@@ -535,7 +541,7 @@ void __init lguest_arch_host_init(void)
+ * compiled-in switcher code and the high-mapped copy we just made.
+ */
+ for (i = 0; i < IDT_ENTRIES; i++)
+- default_idt_entries[i] += switcher_offset();
++ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
+
+ /*
+ * Set up the Switcher's per-cpu areas.
+@@ -618,7 +624,7 @@ void __init lguest_arch_host_init(void)
+ * it will be undisturbed when we switch. To change %cs and jump we
+ * need this structure to feed to Intel's "lcall" instruction.
+ */
+- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
++ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
+ lguest_entry.segment = LGUEST_CS;
+
+ /*
+diff -urNp linux-2.6.32.27/drivers/lguest/x86/switcher_32.S linux-2.6.32.27/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.32.27/drivers/lguest/x86/switcher_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/drivers/lguest/x86/switcher_32.S 2010-12-31 14:47:01.000000000 -0500
+@@ -87,6 +87,7 @@
+ #include <asm/page.h>
+ #include <asm/segment.h>
+ #include <asm/lguest.h>
++#include <asm/processor-flags.h>
+
+ // We mark the start of the code to copy
+ // It's placed in .text tho it's never run here
+@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
+ // Changes type when we load it: damn Intel!
+ // For after we switch over our page tables
+ // That entry will be read-only: we'd crash.
++
++#ifdef CONFIG_PAX_KERNEXEC
++ mov %cr0, %edx
++ xor $X86_CR0_WP, %edx
++ mov %edx, %cr0
++#endif
++
+ movl $(GDT_ENTRY_TSS*8), %edx
+ ltr %dx
+
+@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
+ // Let's clear it again for our return.
+ // The GDT descriptor of the Host
+ // Points to the table after two "size" bytes
+- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
++ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
+ // Clear "used" from type field (byte 5, bit 2)
+- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
++ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
++
++#ifdef CONFIG_PAX_KERNEXEC
++ mov %cr0, %eax
++ xor $X86_CR0_WP, %eax
++ mov %eax, %cr0
++#endif
+
+ // Once our page table's switched, the Guest is live!
+ // The Host fades as we run this final step.
+@@ -295,13 +309,12 @@ deliver_to_host:
+ // I consulted gcc, and it gave
+ // These instructions, which I gladly credit:
+ leal (%edx,%ebx,8), %eax
+- movzwl (%eax),%edx
+- movl 4(%eax), %eax
+- xorw %ax, %ax
+- orl %eax, %edx
++ movl 4(%eax), %edx
++ movw (%eax), %dx
+ // Now the address of the handler's in %edx
+ // We call it now: its "iret" drops us home.
+- jmp *%edx
++ ljmp $__KERNEL_CS, $1f
++1: jmp *%edx
+
+ // Every interrupt can come to us here
+ // But we must truly tell each apart.
diff -urNp linux-2.6.32.27/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.27/drivers/macintosh/via-pmu-backlight.c
--- linux-2.6.32.27/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/macintosh/via-pmu-backlight.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/drivers/macintosh/via-pmu-backlight.c 2010-12-31 14:46:53.000000000 -0500
@@ -15,7 +15,7 @@
#define MAX_PMU_LEVEL 0xFF
@@ -27046,7 +26634,7 @@ diff -urNp linux-2.6.32.27/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.27
diff -urNp linux-2.6.32.27/drivers/macintosh/via-pmu.c linux-2.6.32.27/drivers/macintosh/via-pmu.c
--- linux-2.6.32.27/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/macintosh/via-pmu.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/drivers/macintosh/via-pmu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}
@@ -27058,7 +26646,7 @@ diff -urNp linux-2.6.32.27/drivers/macintosh/via-pmu.c linux-2.6.32.27/drivers/m
};
diff -urNp linux-2.6.32.27/drivers/md/bitmap.c linux-2.6.32.27/drivers/md/bitmap.c
--- linux-2.6.32.27/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/md/bitmap.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/md/bitmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -58,7 +58,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
@@ -27070,7 +26658,7 @@ diff -urNp linux-2.6.32.27/drivers/md/bitmap.c linux-2.6.32.27/drivers/md/bitmap
diff -urNp linux-2.6.32.27/drivers/md/dm-sysfs.c linux-2.6.32.27/drivers/md/dm-sysfs.c
--- linux-2.6.32.27/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/md/dm-sysfs.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/md/dm-sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
NULL,
};
@@ -27082,7 +26670,7 @@ diff -urNp linux-2.6.32.27/drivers/md/dm-sysfs.c linux-2.6.32.27/drivers/md/dm-s
diff -urNp linux-2.6.32.27/drivers/md/dm-table.c linux-2.6.32.27/drivers/md/dm-table.c
--- linux-2.6.32.27/drivers/md/dm-table.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/md/dm-table.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/md/dm-table.c 2010-12-31 14:46:53.000000000 -0500
@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -27094,7 +26682,7 @@ diff -urNp linux-2.6.32.27/drivers/md/dm-table.c linux-2.6.32.27/drivers/md/dm-t
dm_device_name(ti->table->md), bdevname(bdev, b),
diff -urNp linux-2.6.32.27/drivers/md/md.c linux-2.6.32.27/drivers/md/md.c
--- linux-2.6.32.27/drivers/md/md.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/md/md.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/md/md.c 2010-12-31 14:46:53.000000000 -0500
@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko
mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
kfree(rdev);
@@ -27143,7 +26731,7 @@ diff -urNp linux-2.6.32.27/drivers/md/md.c linux-2.6.32.27/drivers/md/md.c
* disk_stats is counted when it completes.
diff -urNp linux-2.6.32.27/drivers/md/md.h linux-2.6.32.27/drivers/md/md.h
--- linux-2.6.32.27/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/md/md.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/md/md.h 2010-12-31 14:46:53.000000000 -0500
@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -27155,7 +26743,7 @@ diff -urNp linux-2.6.32.27/drivers/md/md.h linux-2.6.32.27/drivers/md/md.h
struct mdk_personality
diff -urNp linux-2.6.32.27/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.27/drivers/media/dvb/dvb-core/dvbdev.c
--- linux-2.6.32.27/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-31 14:46:53.000000000 -0500
@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -27166,7 +26754,7 @@ diff -urNp linux-2.6.32.27/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.27/d
int minor;
diff -urNp linux-2.6.32.27/drivers/media/radio/radio-cadet.c linux-2.6.32.27/drivers/media/radio/radio-cadet.c
--- linux-2.6.32.27/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/media/radio/radio-cadet.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/media/radio/radio-cadet.c 2010-12-31 14:46:53.000000000 -0500
@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
while (i < count && dev->rdsin != dev->rdsout)
readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -27178,7 +26766,7 @@ diff -urNp linux-2.6.32.27/drivers/media/radio/radio-cadet.c linux-2.6.32.27/dri
}
diff -urNp linux-2.6.32.27/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.27/drivers/media/video/usbvideo/konicawc.c
--- linux-2.6.32.27/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/media/video/usbvideo/konicawc.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/media/video/usbvideo/konicawc.c 2010-12-31 14:46:53.000000000 -0500
@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
int error;
@@ -27190,7 +26778,7 @@ diff -urNp linux-2.6.32.27/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
if (!input_dev) {
diff -urNp linux-2.6.32.27/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.27/drivers/media/video/usbvideo/quickcam_messenger.c
--- linux-2.6.32.27/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/media/video/usbvideo/quickcam_messenger.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/media/video/usbvideo/quickcam_messenger.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
int error;
@@ -27202,7 +26790,7 @@ diff -urNp linux-2.6.32.27/drivers/media/video/usbvideo/quickcam_messenger.c lin
if (!input_dev) {
diff -urNp linux-2.6.32.27/drivers/message/fusion/mptbase.c linux-2.6.32.27/drivers/message/fusion/mptbase.c
--- linux-2.6.32.27/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/message/fusion/mptbase.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/drivers/message/fusion/mptbase.c 2010-12-31 14:46:53.000000000 -0500
@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -27220,7 +26808,7 @@ diff -urNp linux-2.6.32.27/drivers/message/fusion/mptbase.c linux-2.6.32.27/driv
*/
diff -urNp linux-2.6.32.27/drivers/message/fusion/mptdebug.h linux-2.6.32.27/drivers/message/fusion/mptdebug.h
--- linux-2.6.32.27/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/message/fusion/mptdebug.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/drivers/message/fusion/mptdebug.h 2010-12-31 14:46:53.000000000 -0500
@@ -71,7 +71,7 @@
CMD; \
}
@@ -27232,7 +26820,7 @@ diff -urNp linux-2.6.32.27/drivers/message/fusion/mptdebug.h linux-2.6.32.27/dri
diff -urNp linux-2.6.32.27/drivers/message/fusion/mptsas.c linux-2.6.32.27/drivers/message/fusion/mptsas.c
--- linux-2.6.32.27/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/message/fusion/mptsas.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/drivers/message/fusion/mptsas.c 2010-12-31 14:46:53.000000000 -0500
@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
@@ -27283,7 +26871,7 @@ diff -urNp linux-2.6.32.27/drivers/message/fusion/mptsas.c linux-2.6.32.27/drive
{
diff -urNp linux-2.6.32.27/drivers/message/fusion/mptscsih.c linux-2.6.32.27/drivers/message/fusion/mptscsih.c
--- linux-2.6.32.27/drivers/message/fusion/mptscsih.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/drivers/message/fusion/mptscsih.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/drivers/message/fusion/mptscsih.c 2010-12-31 14:46:53.000000000 -0500
@@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
@@ -27311,7 +26899,7 @@ diff -urNp linux-2.6.32.27/drivers/message/fusion/mptscsih.c linux-2.6.32.27/dri
}
diff -urNp linux-2.6.32.27/drivers/message/i2o/i2o_proc.c linux-2.6.32.27/drivers/message/i2o/i2o_proc.c
--- linux-2.6.32.27/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/message/i2o/i2o_proc.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/drivers/message/i2o/i2o_proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -27400,7 +26988,7 @@ diff -urNp linux-2.6.32.27/drivers/message/i2o/i2o_proc.c linux-2.6.32.27/driver
}
diff -urNp linux-2.6.32.27/drivers/misc/kgdbts.c linux-2.6.32.27/drivers/misc/kgdbts.c
--- linux-2.6.32.27/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/misc/kgdbts.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/misc/kgdbts.c 2010-12-31 14:46:53.000000000 -0500
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
@@ -27421,7 +27009,7 @@ diff -urNp linux-2.6.32.27/drivers/misc/kgdbts.c linux-2.6.32.27/drivers/misc/kg
.write_char = kgdbts_put_char,
diff -urNp linux-2.6.32.27/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.27/drivers/misc/sgi-gru/gruhandles.c
--- linux-2.6.32.27/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/misc/sgi-gru/gruhandles.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/misc/sgi-gru/gruhandles.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -27435,7 +27023,7 @@ diff -urNp linux-2.6.32.27/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.27/dri
}
diff -urNp linux-2.6.32.27/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.27/drivers/misc/sgi-gru/gruprocfs.c
--- linux-2.6.32.27/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/misc/sgi-gru/gruprocfs.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/misc/sgi-gru/gruprocfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -27461,7 +27049,7 @@ diff -urNp linux-2.6.32.27/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.27/driv
count ? total / count : 0, max);
diff -urNp linux-2.6.32.27/drivers/misc/sgi-gru/grutables.h linux-2.6.32.27/drivers/misc/sgi-gru/grutables.h
--- linux-2.6.32.27/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/misc/sgi-gru/grutables.h 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/misc/sgi-gru/grutables.h 2010-12-31 14:46:53.000000000 -0500
@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -27647,7 +27235,7 @@ diff -urNp linux-2.6.32.27/drivers/misc/sgi-gru/grutables.h linux-2.6.32.27/driv
#ifdef CONFIG_SGI_GRU_DEBUG
diff -urNp linux-2.6.32.27/drivers/mtd/devices/doc2000.c linux-2.6.32.27/drivers/mtd/devices/doc2000.c
--- linux-2.6.32.27/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/mtd/devices/doc2000.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/mtd/devices/doc2000.c 2010-12-31 14:46:53.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 */
@@ -27659,7 +27247,7 @@ diff -urNp linux-2.6.32.27/drivers/mtd/devices/doc2000.c linux-2.6.32.27/drivers
(long) to, (long) len);
diff -urNp linux-2.6.32.27/drivers/mtd/devices/doc2001.c linux-2.6.32.27/drivers/mtd/devices/doc2001.c
--- linux-2.6.32.27/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/mtd/devices/doc2001.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/mtd/devices/doc2001.c 2010-12-31 14:46:53.000000000 -0500
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -27671,7 +27259,7 @@ diff -urNp linux-2.6.32.27/drivers/mtd/devices/doc2001.c linux-2.6.32.27/drivers
/* Don't allow a single read to cross a 512-byte block boundary */
diff -urNp linux-2.6.32.27/drivers/mtd/ubi/build.c linux-2.6.32.27/drivers/mtd/ubi/build.c
--- linux-2.6.32.27/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/mtd/ubi/build.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/mtd/ubi/build.c 2010-12-31 14:46:53.000000000 -0500
@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -27713,7 +27301,7 @@ diff -urNp linux-2.6.32.27/drivers/mtd/ubi/build.c linux-2.6.32.27/drivers/mtd/u
/**
diff -urNp linux-2.6.32.27/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.27/drivers/net/cxgb3/cxgb3_main.c
--- linux-2.6.32.27/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/cxgb3/cxgb3_main.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/cxgb3/cxgb3_main.c 2010-12-31 14:46:53.000000000 -0500
@@ -2275,7 +2275,7 @@ static int cxgb_extension_ioctl(struct n
case CHELSIO_GET_QSET_NUM:{
struct ch_reg edata;
@@ -27725,7 +27313,7 @@ diff -urNp linux-2.6.32.27/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.27/driver
edata.val = pi->nqsets;
diff -urNp linux-2.6.32.27/drivers/net/e1000e/82571.c linux-2.6.32.27/drivers/net/e1000e/82571.c
--- linux-2.6.32.27/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/e1000e/82571.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/e1000e/82571.c 2010-12-31 14:46:53.000000000 -0500
@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -27781,7 +27369,7 @@ diff -urNp linux-2.6.32.27/drivers/net/e1000e/82571.c linux-2.6.32.27/drivers/ne
.release_nvm = e1000_release_nvm_82571,
diff -urNp linux-2.6.32.27/drivers/net/e1000e/e1000.h linux-2.6.32.27/drivers/net/e1000e/e1000.h
--- linux-2.6.32.27/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/e1000e/e1000.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/e1000e/e1000.h 2010-12-31 14:46:53.000000000 -0500
@@ -375,9 +375,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
@@ -27797,7 +27385,7 @@ diff -urNp linux-2.6.32.27/drivers/net/e1000e/e1000.h linux-2.6.32.27/drivers/ne
/* hardware capability, feature, and workaround flags */
diff -urNp linux-2.6.32.27/drivers/net/e1000e/es2lan.c linux-2.6.32.27/drivers/net/e1000e/es2lan.c
--- linux-2.6.32.27/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/e1000e/es2lan.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/e1000e/es2lan.c 2010-12-31 14:46:53.000000000 -0500
@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -27835,7 +27423,7 @@ diff -urNp linux-2.6.32.27/drivers/net/e1000e/es2lan.c linux-2.6.32.27/drivers/n
.release_nvm = e1000_release_nvm_80003es2lan,
diff -urNp linux-2.6.32.27/drivers/net/e1000e/hw.h linux-2.6.32.27/drivers/net/e1000e/hw.h
--- linux-2.6.32.27/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/e1000e/hw.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/e1000e/hw.h 2010-12-31 14:46:53.000000000 -0500
@@ -756,34 +756,34 @@ struct e1000_mac_operations {
/* Function pointers for the PHY. */
@@ -27897,7 +27485,7 @@ diff -urNp linux-2.6.32.27/drivers/net/e1000e/hw.h linux-2.6.32.27/drivers/net/e
struct e1000_mac_info {
diff -urNp linux-2.6.32.27/drivers/net/e1000e/ich8lan.c linux-2.6.32.27/drivers/net/e1000e/ich8lan.c
--- linux-2.6.32.27/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/e1000e/ich8lan.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/e1000e/ich8lan.c 2010-12-31 14:46:53.000000000 -0500
@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
@@ -27927,7 +27515,7 @@ diff -urNp linux-2.6.32.27/drivers/net/e1000e/ich8lan.c linux-2.6.32.27/drivers/
.release_nvm = e1000_release_nvm_ich8lan,
diff -urNp linux-2.6.32.27/drivers/net/eql.c linux-2.6.32.27/drivers/net/eql.c
--- linux-2.6.32.27/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/eql.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/eql.c 2010-12-31 14:46:53.000000000 -0500
@@ -554,7 +554,7 @@ static int eql_g_master_cfg(struct net_d
equalizer_t *eql;
master_config_t mc;
@@ -27939,7 +27527,7 @@ diff -urNp linux-2.6.32.27/drivers/net/eql.c linux-2.6.32.27/drivers/net/eql.c
eql = netdev_priv(dev);
diff -urNp linux-2.6.32.27/drivers/net/ibmveth.c linux-2.6.32.27/drivers/net/ibmveth.c
--- linux-2.6.32.27/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/ibmveth.c 2010-12-09 18:12:31.000000000 -0500
++++ linux-2.6.32.27/drivers/net/ibmveth.c 2010-12-31 14:46:53.000000000 -0500
@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
NULL,
};
@@ -27951,7 +27539,7 @@ diff -urNp linux-2.6.32.27/drivers/net/ibmveth.c linux-2.6.32.27/drivers/net/ibm
};
diff -urNp linux-2.6.32.27/drivers/net/igb/e1000_82575.c linux-2.6.32.27/drivers/net/igb/e1000_82575.c
--- linux-2.6.32.27/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/igb/e1000_82575.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/igb/e1000_82575.c 2010-12-31 14:46:53.000000000 -0500
@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct
wr32(E1000_VT_CTL, vt_ctl);
}
@@ -27979,7 +27567,7 @@ diff -urNp linux-2.6.32.27/drivers/net/igb/e1000_82575.c linux-2.6.32.27/drivers
.release = igb_release_nvm_82575,
diff -urNp linux-2.6.32.27/drivers/net/igb/e1000_hw.h linux-2.6.32.27/drivers/net/igb/e1000_hw.h
--- linux-2.6.32.27/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/igb/e1000_hw.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/igb/e1000_hw.h 2010-12-31 14:46:53.000000000 -0500
@@ -305,17 +305,17 @@ struct e1000_phy_operations {
};
@@ -28007,7 +27595,7 @@ diff -urNp linux-2.6.32.27/drivers/net/igb/e1000_hw.h linux-2.6.32.27/drivers/ne
extern const struct e1000_info e1000_82575_info;
diff -urNp linux-2.6.32.27/drivers/net/irda/vlsi_ir.c linux-2.6.32.27/drivers/net/irda/vlsi_ir.c
--- linux-2.6.32.27/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/irda/vlsi_ir.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/irda/vlsi_ir.c 2010-12-31 14:46:53.000000000 -0500
@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
/* no race - tx-ring already empty */
vlsi_set_baud(idev, iobase);
@@ -28026,7 +27614,7 @@ diff -urNp linux-2.6.32.27/drivers/net/irda/vlsi_ir.c linux-2.6.32.27/drivers/ne
return NETDEV_TX_OK;
diff -urNp linux-2.6.32.27/drivers/net/iseries_veth.c linux-2.6.32.27/drivers/net/iseries_veth.c
--- linux-2.6.32.27/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/iseries_veth.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/iseries_veth.c 2010-12-31 14:46:53.000000000 -0500
@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
NULL
};
@@ -28047,7 +27635,7 @@ diff -urNp linux-2.6.32.27/drivers/net/iseries_veth.c linux-2.6.32.27/drivers/ne
diff -urNp linux-2.6.32.27/drivers/net/pcnet32.c linux-2.6.32.27/drivers/net/pcnet32.c
--- linux-2.6.32.27/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/pcnet32.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/pcnet32.c 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -28059,7 +27647,7 @@ diff -urNp linux-2.6.32.27/drivers/net/pcnet32.c linux-2.6.32.27/drivers/net/pcn
static int pcnet32_debug = 0;
diff -urNp linux-2.6.32.27/drivers/net/tg3.h linux-2.6.32.27/drivers/net/tg3.h
--- linux-2.6.32.27/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/tg3.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/tg3.h 2010-12-31 14:46:53.000000000 -0500
@@ -95,6 +95,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -28070,7 +27658,7 @@ diff -urNp linux-2.6.32.27/drivers/net/tg3.h linux-2.6.32.27/drivers/net/tg3.h
#define CHIPREV_ID_5752_A0 0x6000
diff -urNp linux-2.6.32.27/drivers/net/tulip/de4x5.c linux-2.6.32.27/drivers/net/tulip/de4x5.c
--- linux-2.6.32.27/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/tulip/de4x5.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/tulip/de4x5.c 2010-12-31 14:46:53.000000000 -0500
@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
@@ -28100,7 +27688,7 @@ diff -urNp linux-2.6.32.27/drivers/net/tulip/de4x5.c linux-2.6.32.27/drivers/net
#define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */
diff -urNp linux-2.6.32.27/drivers/net/usb/hso.c linux-2.6.32.27/drivers/net/usb/hso.c
--- linux-2.6.32.27/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/usb/hso.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/net/usb/hso.c 2010-12-31 14:46:53.000000000 -0500
@@ -258,7 +258,7 @@ struct hso_serial {
/* from usb_serial_port */
@@ -28195,7 +27783,7 @@ diff -urNp linux-2.6.32.27/drivers/net/usb/hso.c linux-2.6.32.27/drivers/net/usb
hso_kick_transmit(dev2ser(serial_table[i]));
diff -urNp linux-2.6.32.27/drivers/net/wireless/b43/debugfs.c linux-2.6.32.27/drivers/net/wireless/b43/debugfs.c
--- linux-2.6.32.27/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/b43/debugfs.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/b43/debugfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ static struct dentry *rootdir;
struct b43_debugfs_fops {
ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -28207,7 +27795,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/b43/debugfs.c linux-2.6.32.27/dr
};
diff -urNp linux-2.6.32.27/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.27/drivers/net/wireless/b43legacy/debugfs.c
--- linux-2.6.32.27/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/b43legacy/debugfs.c 2010-12-09 18:12:32.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/b43legacy/debugfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -44,7 +44,7 @@ static struct dentry *rootdir;
struct b43legacy_debugfs_fops {
ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -28219,7 +27807,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
/* Take wl->irq_lock before calling read/write? */
diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-1000.c
--- linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-12-31 14:46:53.000000000 -0500
@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
},
};
@@ -28231,7 +27819,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-3945.c
--- linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-12-31 14:46:53.000000000 -0500
@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
};
@@ -28243,7 +27831,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
.hcmd = &iwl3945_hcmd,
diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-4965.c
--- linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-12-09 18:12:32.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-12-31 14:46:53.000000000 -0500
@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
},
};
@@ -28255,7 +27843,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
.hcmd = &iwl4965_hcmd,
diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-5000.c
--- linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-12-31 14:46:53.000000000 -0500
@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
},
};
@@ -28275,7 +27863,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-6000.c
--- linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-12-31 14:46:53.000000000 -0500
@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
.calc_rssi = iwl5000_calc_rssi,
};
@@ -28287,7 +27875,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-debug.h
--- linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-12-09 18:12:32.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-12-31 14:46:53.000000000 -0500
@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
#endif
@@ -28301,7 +27889,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
{}
diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-dev.h
--- linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-12-31 14:46:53.000000000 -0500
@@ -68,7 +68,7 @@ struct iwl_tx_queue;
/* shared structures from iwl-5000.c */
@@ -28313,7 +27901,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.2
extern struct iwl_hcmd_ops iwl5000_hcmd;
diff -urNp linux-2.6.32.27/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.27/drivers/net/wireless/libertas/debugfs.c
--- linux-2.6.32.27/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/libertas/debugfs.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/libertas/debugfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -708,7 +708,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
@@ -28325,7 +27913,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
static const struct lbs_debugfs_files debugfs_files[] = {
diff -urNp linux-2.6.32.27/drivers/net/wireless/rndis_wlan.c linux-2.6.32.27/drivers/net/wireless/rndis_wlan.c
--- linux-2.6.32.27/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/net/wireless/rndis_wlan.c 2010-12-09 18:12:33.000000000 -0500
++++ linux-2.6.32.27/drivers/net/wireless/rndis_wlan.c 2010-12-31 14:46:53.000000000 -0500
@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -28337,7 +27925,7 @@ diff -urNp linux-2.6.32.27/drivers/net/wireless/rndis_wlan.c linux-2.6.32.27/dri
tmp = cpu_to_le32(rts_threshold);
diff -urNp linux-2.6.32.27/drivers/oprofile/buffer_sync.c linux-2.6.32.27/drivers/oprofile/buffer_sync.c
--- linux-2.6.32.27/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/drivers/oprofile/buffer_sync.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/oprofile/buffer_sync.c 2010-12-31 14:46:53.000000000 -0500
@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
@@ -28375,7 +27963,7 @@ diff -urNp linux-2.6.32.27/drivers/oprofile/buffer_sync.c linux-2.6.32.27/driver
release_mm(mm);
diff -urNp linux-2.6.32.27/drivers/oprofile/event_buffer.c linux-2.6.32.27/drivers/oprofile/event_buffer.c
--- linux-2.6.32.27/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/oprofile/event_buffer.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/oprofile/event_buffer.c 2010-12-31 14:46:53.000000000 -0500
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -28387,7 +27975,7 @@ diff -urNp linux-2.6.32.27/drivers/oprofile/event_buffer.c linux-2.6.32.27/drive
diff -urNp linux-2.6.32.27/drivers/oprofile/oprof.c linux-2.6.32.27/drivers/oprofile/oprof.c
--- linux-2.6.32.27/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/oprofile/oprof.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/oprofile/oprof.c 2010-12-31 14:46:53.000000000 -0500
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -28399,7 +27987,7 @@ diff -urNp linux-2.6.32.27/drivers/oprofile/oprof.c linux-2.6.32.27/drivers/opro
diff -urNp linux-2.6.32.27/drivers/oprofile/oprofilefs.c linux-2.6.32.27/drivers/oprofile/oprofilefs.c
--- linux-2.6.32.27/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/oprofile/oprofilefs.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/oprofile/oprofilefs.c 2010-12-31 14:46:53.000000000 -0500
@@ -187,7 +187,7 @@ static const struct file_operations atom
@@ -28411,7 +27999,7 @@ diff -urNp linux-2.6.32.27/drivers/oprofile/oprofilefs.c linux-2.6.32.27/drivers
&atomic_ro_fops, 0444);
diff -urNp linux-2.6.32.27/drivers/oprofile/oprofile_stats.c linux-2.6.32.27/drivers/oprofile/oprofile_stats.c
--- linux-2.6.32.27/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/oprofile/oprofile_stats.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/oprofile/oprofile_stats.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -28431,7 +28019,7 @@ diff -urNp linux-2.6.32.27/drivers/oprofile/oprofile_stats.c linux-2.6.32.27/dri
diff -urNp linux-2.6.32.27/drivers/oprofile/oprofile_stats.h linux-2.6.32.27/drivers/oprofile/oprofile_stats.h
--- linux-2.6.32.27/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/oprofile/oprofile_stats.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/oprofile/oprofile_stats.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -28451,7 +28039,7 @@ diff -urNp linux-2.6.32.27/drivers/oprofile/oprofile_stats.h linux-2.6.32.27/dri
extern struct oprofile_stat_struct oprofile_stats;
diff -urNp linux-2.6.32.27/drivers/parisc/pdc_stable.c linux-2.6.32.27/drivers/parisc/pdc_stable.c
--- linux-2.6.32.27/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/parisc/pdc_stable.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/parisc/pdc_stable.c 2010-12-31 14:46:53.000000000 -0500
@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
return ret;
}
@@ -28463,7 +28051,7 @@ diff -urNp linux-2.6.32.27/drivers/parisc/pdc_stable.c linux-2.6.32.27/drivers/p
};
diff -urNp linux-2.6.32.27/drivers/parport/procfs.c linux-2.6.32.27/drivers/parport/procfs.c
--- linux-2.6.32.27/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/parport/procfs.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/drivers/parport/procfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -28484,7 +28072,7 @@ diff -urNp linux-2.6.32.27/drivers/parport/procfs.c linux-2.6.32.27/drivers/parp
diff -urNp linux-2.6.32.27/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.27/drivers/pci/hotplug/acpiphp_glue.c
--- linux-2.6.32.27/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pci/hotplug/acpiphp_glue.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pci/hotplug/acpiphp_glue.c 2010-12-31 14:46:53.000000000 -0500
@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
}
@@ -28496,7 +28084,7 @@ diff -urNp linux-2.6.32.27/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.27/dr
diff -urNp linux-2.6.32.27/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.27/drivers/pci/hotplug/cpqphp_nvram.c
--- linux-2.6.32.27/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pci/hotplug/cpqphp_nvram.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pci/hotplug/cpqphp_nvram.c 2010-12-31 14:46:53.000000000 -0500
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -28513,7 +28101,7 @@ diff -urNp linux-2.6.32.27/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.27/dr
/* initialize our int15 lock */
diff -urNp linux-2.6.32.27/drivers/pci/hotplug/fakephp.c linux-2.6.32.27/drivers/pci/hotplug/fakephp.c
--- linux-2.6.32.27/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pci/hotplug/fakephp.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pci/hotplug/fakephp.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
}
@@ -28525,7 +28113,7 @@ diff -urNp linux-2.6.32.27/drivers/pci/hotplug/fakephp.c linux-2.6.32.27/drivers
.release = &legacy_release,
diff -urNp linux-2.6.32.27/drivers/pci/intel-iommu.c linux-2.6.32.27/drivers/pci/intel-iommu.c
--- linux-2.6.32.27/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/drivers/pci/intel-iommu.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pci/intel-iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2643,7 +2643,7 @@ error:
return 0;
}
@@ -28597,7 +28185,7 @@ diff -urNp linux-2.6.32.27/drivers/pci/intel-iommu.c linux-2.6.32.27/drivers/pci
.map_sg = intel_map_sg,
diff -urNp linux-2.6.32.27/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.27/drivers/pci/pcie/portdrv_pci.c
--- linux-2.6.32.27/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pci/pcie/portdrv_pci.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pci/pcie/portdrv_pci.c 2010-12-31 14:46:53.000000000 -0500
@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
static const struct pci_device_id port_pci_ids[] = { {
/* handle any PCI-Express port */
@@ -28609,7 +28197,7 @@ diff -urNp linux-2.6.32.27/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.27/driver
diff -urNp linux-2.6.32.27/drivers/pci/probe.c linux-2.6.32.27/drivers/pci/probe.c
--- linux-2.6.32.27/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pci/probe.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pci/probe.c 2010-12-31 14:46:53.000000000 -0500
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
@@ -28629,7 +28217,7 @@ diff -urNp linux-2.6.32.27/drivers/pci/probe.c linux-2.6.32.27/drivers/pci/probe
{
diff -urNp linux-2.6.32.27/drivers/pci/proc.c linux-2.6.32.27/drivers/pci/proc.c
--- linux-2.6.32.27/drivers/pci/proc.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/pci/proc.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/pci/proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -480,7 +480,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -28649,7 +28237,7 @@ diff -urNp linux-2.6.32.27/drivers/pci/proc.c linux-2.6.32.27/drivers/pci/proc.c
proc_initialized = 1;
diff -urNp linux-2.6.32.27/drivers/pci/slot.c linux-2.6.32.27/drivers/pci/slot.c
--- linux-2.6.32.27/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pci/slot.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pci/slot.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
return attribute->store ? attribute->store(slot, buf, len) : -EIO;
}
@@ -28661,7 +28249,7 @@ diff -urNp linux-2.6.32.27/drivers/pci/slot.c linux-2.6.32.27/drivers/pci/slot.c
};
diff -urNp linux-2.6.32.27/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.27/drivers/pcmcia/pcmcia_ioctl.c
--- linux-2.6.32.27/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pcmcia/pcmcia_ioctl.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/pcmcia/pcmcia_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
return -EFAULT;
}
@@ -28673,7 +28261,7 @@ diff -urNp linux-2.6.32.27/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.27/drivers
diff -urNp linux-2.6.32.27/drivers/pcmcia/ti113x.h linux-2.6.32.27/drivers/pcmcia/ti113x.h
--- linux-2.6.32.27/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pcmcia/ti113x.h 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/pcmcia/ti113x.h 2010-12-31 14:46:53.000000000 -0500
@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -28685,7 +28273,7 @@ diff -urNp linux-2.6.32.27/drivers/pcmcia/ti113x.h linux-2.6.32.27/drivers/pcmci
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
diff -urNp linux-2.6.32.27/drivers/pcmcia/yenta_socket.c linux-2.6.32.27/drivers/pcmcia/yenta_socket.c
--- linux-2.6.32.27/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pcmcia/yenta_socket.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/pcmcia/yenta_socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
/* match any cardbus bridge */
@@ -28697,7 +28285,7 @@ diff -urNp linux-2.6.32.27/drivers/pcmcia/yenta_socket.c linux-2.6.32.27/drivers
diff -urNp linux-2.6.32.27/drivers/platform/x86/acer-wmi.c linux-2.6.32.27/drivers/platform/x86/acer-wmi.c
--- linux-2.6.32.27/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/acer-wmi.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/acer-wmi.c 2010-12-31 14:46:53.000000000 -0500
@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
return 0;
}
@@ -28709,7 +28297,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/acer-wmi.c linux-2.6.32.27/drive
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/asus_acpi.c linux-2.6.32.27/drivers/platform/x86/asus_acpi.c
--- linux-2.6.32.27/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/asus_acpi.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/asus_acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
return 0;
}
@@ -28721,7 +28309,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/asus_acpi.c linux-2.6.32.27/driv
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/asus-laptop.c linux-2.6.32.27/drivers/platform/x86/asus-laptop.c
--- linux-2.6.32.27/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/asus-laptop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/asus-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
*/
static int read_brightness(struct backlight_device *bd);
@@ -28733,7 +28321,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/asus-laptop.c linux-2.6.32.27/dr
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/compal-laptop.c linux-2.6.32.27/drivers/platform/x86/compal-laptop.c
--- linux-2.6.32.27/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/compal-laptop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/compal-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -28745,7 +28333,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/compal-laptop.c linux-2.6.32.27/
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/dell-laptop.c linux-2.6.32.27/drivers/platform/x86/dell-laptop.c
--- linux-2.6.32.27/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/dell-laptop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/dell-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
return buffer.output[1];
}
@@ -28757,7 +28345,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/dell-laptop.c linux-2.6.32.27/dr
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.27/drivers/platform/x86/eeepc-laptop.c
--- linux-2.6.32.27/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/eeepc-laptop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/eeepc-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
*/
static int read_brightness(struct backlight_device *bd);
@@ -28769,7 +28357,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.27/d
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.27/drivers/platform/x86/fujitsu-laptop.c
--- linux-2.6.32.27/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/fujitsu-laptop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/fujitsu-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
return ret;
}
@@ -28781,7 +28369,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.27
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/msi-laptop.c linux-2.6.32.27/drivers/platform/x86/msi-laptop.c
--- linux-2.6.32.27/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/msi-laptop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/msi-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -28793,7 +28381,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/msi-laptop.c linux-2.6.32.27/dri
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.27/drivers/platform/x86/panasonic-laptop.c
--- linux-2.6.32.27/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/panasonic-laptop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/panasonic-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
}
@@ -28805,7 +28393,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/sony-laptop.c linux-2.6.32.27/drivers/platform/x86/sony-laptop.c
--- linux-2.6.32.27/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/sony-laptop.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/sony-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
}
@@ -28817,7 +28405,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/sony-laptop.c linux-2.6.32.27/dr
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.27/drivers/platform/x86/thinkpad_acpi.c
--- linux-2.6.32.27/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/thinkpad_acpi.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/thinkpad_acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
BACKLIGHT_UPDATE_HOTKEY);
}
@@ -28829,7 +28417,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.27/
};
diff -urNp linux-2.6.32.27/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.27/drivers/platform/x86/toshiba_acpi.c
--- linux-2.6.32.27/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/platform/x86/toshiba_acpi.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/platform/x86/toshiba_acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
return AE_OK;
}
@@ -28841,7 +28429,7 @@ diff -urNp linux-2.6.32.27/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.27/d
};
diff -urNp linux-2.6.32.27/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.27/drivers/pnp/pnpbios/bioscalls.c
--- linux-2.6.32.27/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pnp/pnpbios/bioscalls.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pnp/pnpbios/bioscalls.c 2010-12-31 14:46:53.000000000 -0500
@@ -60,7 +60,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -28900,7 +28488,7 @@ diff -urNp linux-2.6.32.27/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.27/drive
}
diff -urNp linux-2.6.32.27/drivers/pnp/quirks.c linux-2.6.32.27/drivers/pnp/quirks.c
--- linux-2.6.32.27/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pnp/quirks.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pnp/quirks.c 2010-12-31 14:46:53.000000000 -0500
@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
/* PnP resources that might overlap PCI BARs */
{"PNP0c01", quirk_system_pci_resources},
@@ -28912,7 +28500,7 @@ diff -urNp linux-2.6.32.27/drivers/pnp/quirks.c linux-2.6.32.27/drivers/pnp/quir
void pnp_fixup_device(struct pnp_dev *dev)
diff -urNp linux-2.6.32.27/drivers/pnp/resource.c linux-2.6.32.27/drivers/pnp/resource.c
--- linux-2.6.32.27/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/pnp/resource.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/pnp/resource.c 2010-12-31 14:46:53.000000000 -0500
@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -28933,7 +28521,7 @@ diff -urNp linux-2.6.32.27/drivers/pnp/resource.c linux-2.6.32.27/drivers/pnp/re
/* check if the resource is reserved */
diff -urNp linux-2.6.32.27/drivers/s390/cio/qdio_perf.c linux-2.6.32.27/drivers/s390/cio/qdio_perf.c
--- linux-2.6.32.27/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/s390/cio/qdio_perf.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/s390/cio/qdio_perf.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
static int qdio_perf_proc_show(struct seq_file *m, void *v)
{
@@ -29011,7 +28599,7 @@ diff -urNp linux-2.6.32.27/drivers/s390/cio/qdio_perf.c linux-2.6.32.27/drivers/
}
diff -urNp linux-2.6.32.27/drivers/s390/cio/qdio_perf.h linux-2.6.32.27/drivers/s390/cio/qdio_perf.h
--- linux-2.6.32.27/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/s390/cio/qdio_perf.h 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/s390/cio/qdio_perf.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,46 +13,46 @@
struct qdio_perf_stats {
@@ -29086,7 +28674,7 @@ diff -urNp linux-2.6.32.27/drivers/s390/cio/qdio_perf.h linux-2.6.32.27/drivers/
int qdio_setup_perf_stats(void);
diff -urNp linux-2.6.32.27/drivers/scsi/ipr.c linux-2.6.32.27/drivers/scsi/ipr.c
--- linux-2.6.32.27/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/scsi/ipr.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/scsi/ipr.c 2010-12-31 14:46:53.000000000 -0500
@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
@@ -29098,7 +28686,7 @@ diff -urNp linux-2.6.32.27/drivers/scsi/ipr.c linux-2.6.32.27/drivers/scsi/ipr.c
.post_internal_cmd = ipr_ata_post_internal,
diff -urNp linux-2.6.32.27/drivers/scsi/libfc/fc_exch.c linux-2.6.32.27/drivers/scsi/libfc/fc_exch.c
--- linux-2.6.32.27/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/scsi/libfc/fc_exch.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/scsi/libfc/fc_exch.c 2010-12-31 14:46:53.000000000 -0500
@@ -86,12 +86,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -29222,7 +28810,7 @@ diff -urNp linux-2.6.32.27/drivers/scsi/libfc/fc_exch.c linux-2.6.32.27/drivers/
}
diff -urNp linux-2.6.32.27/drivers/scsi/libsas/sas_ata.c linux-2.6.32.27/drivers/scsi/libsas/sas_ata.c
--- linux-2.6.32.27/drivers/scsi/libsas/sas_ata.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/drivers/scsi/libsas/sas_ata.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/scsi/libsas/sas_ata.c 2010-12-31 14:46:53.000000000 -0500
@@ -343,10 +343,10 @@ static int sas_ata_scr_read(struct ata_l
}
}
@@ -29238,7 +28826,7 @@ diff -urNp linux-2.6.32.27/drivers/scsi/libsas/sas_ata.c linux-2.6.32.27/drivers
.qc_fill_rtf = sas_ata_qc_fill_rtf,
diff -urNp linux-2.6.32.27/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.27/drivers/scsi/mpt2sas/mpt2sas_debug.h
--- linux-2.6.32.27/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@
CMD; \
}
@@ -29250,7 +28838,7 @@ diff -urNp linux-2.6.32.27/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.27/
diff -urNp linux-2.6.32.27/drivers/scsi/scsi_logging.h linux-2.6.32.27/drivers/scsi/scsi_logging.h
--- linux-2.6.32.27/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/scsi/scsi_logging.h 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/scsi/scsi_logging.h 2010-12-31 14:46:53.000000000 -0500
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
@@ -29262,7 +28850,7 @@ diff -urNp linux-2.6.32.27/drivers/scsi/scsi_logging.h linux-2.6.32.27/drivers/s
/*
diff -urNp linux-2.6.32.27/drivers/scsi/sg.c linux-2.6.32.27/drivers/scsi/sg.c
--- linux-2.6.32.27/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/scsi/sg.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/scsi/sg.c 2010-12-31 14:46:53.000000000 -0500
@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
@@ -29283,7 +28871,7 @@ diff -urNp linux-2.6.32.27/drivers/scsi/sg.c linux-2.6.32.27/drivers/scsi/sg.c
if (!sg_proc_sgp)
diff -urNp linux-2.6.32.27/drivers/serial/8250_pci.c linux-2.6.32.27/drivers/serial/8250_pci.c
--- linux-2.6.32.27/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/serial/8250_pci.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/serial/8250_pci.c 2010-12-31 14:46:53.000000000 -0500
@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -29295,7 +28883,7 @@ diff -urNp linux-2.6.32.27/drivers/serial/8250_pci.c linux-2.6.32.27/drivers/ser
static struct pci_driver serial_pci_driver = {
diff -urNp linux-2.6.32.27/drivers/serial/kgdboc.c linux-2.6.32.27/drivers/serial/kgdboc.c
--- linux-2.6.32.27/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/serial/kgdboc.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/serial/kgdboc.c 2010-12-31 14:46:53.000000000 -0500
@@ -18,7 +18,7 @@
#define MAX_CONFIG_LEN 40
@@ -29316,7 +28904,7 @@ diff -urNp linux-2.6.32.27/drivers/serial/kgdboc.c linux-2.6.32.27/drivers/seria
.write_char = kgdboc_put_char,
diff -urNp linux-2.6.32.27/drivers/staging/android/binder.c linux-2.6.32.27/drivers/staging/android/binder.c
--- linux-2.6.32.27/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/android/binder.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/android/binder.c 2010-12-31 14:46:53.000000000 -0500
@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
}
@@ -29328,7 +28916,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/android/binder.c linux-2.6.32.27/driv
};
diff -urNp linux-2.6.32.27/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.27/drivers/staging/b3dfg/b3dfg.c
--- linux-2.6.32.27/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/b3dfg/b3dfg.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/b3dfg/b3dfg.c 2010-12-31 14:46:53.000000000 -0500
@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
return VM_FAULT_NOPAGE;
}
@@ -29349,7 +28937,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.27/drivers
.release = b3dfg_release,
diff -urNp linux-2.6.32.27/drivers/staging/comedi/comedi_fops.c linux-2.6.32.27/drivers/staging/comedi/comedi_fops.c
--- linux-2.6.32.27/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/comedi/comedi_fops.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/comedi/comedi_fops.c 2010-12-31 14:46:53.000000000 -0500
@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
mutex_unlock(&dev->mutex);
}
@@ -29361,7 +28949,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/comedi/comedi_fops.c linux-2.6.32.27/
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.27/drivers/staging/dream/qdsp5/adsp_driver.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/adsp_driver.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/adsp_driver.c 2010-12-31 14:46:53.000000000 -0500
@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
static dev_t adsp_devno;
static struct class *adsp_class;
@@ -29373,7 +28961,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
.unlocked_ioctl = adsp_ioctl,
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_aac.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_aac.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_aac.c 2010-12-31 14:46:53.000000000 -0500
@@ -1022,7 +1022,7 @@ done:
return rc;
}
@@ -29385,7 +28973,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
.release = audio_release,
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_amrnb.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-12-31 14:46:53.000000000 -0500
@@ -833,7 +833,7 @@ done:
return rc;
}
@@ -29397,7 +28985,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
.release = audamrnb_release,
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_evrc.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_evrc.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_evrc.c 2010-12-31 14:46:53.000000000 -0500
@@ -805,7 +805,7 @@ dma_fail:
return rc;
}
@@ -29409,7 +28997,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
.release = audevrc_release,
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_in.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_in.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_in.c 2010-12-31 14:46:53.000000000 -0500
@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
return 0;
}
@@ -29430,7 +29018,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.2
.unlocked_ioctl = audpre_ioctl,
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_mp3.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_mp3.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_mp3.c 2010-12-31 14:46:53.000000000 -0500
@@ -941,7 +941,7 @@ done:
return rc;
}
@@ -29442,7 +29030,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
.release = audio_release,
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_out.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_out.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_out.c 2010-12-31 14:46:53.000000000 -0500
@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
return 0;
}
@@ -29463,7 +29051,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
.unlocked_ioctl = audpp_ioctl,
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_qcelp.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-12-31 14:46:53.000000000 -0500
@@ -816,7 +816,7 @@ err:
return rc;
}
@@ -29475,7 +29063,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
.release = audqcelp_release,
diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.27/drivers/staging/dream/qdsp5/snd.c
--- linux-2.6.32.27/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/qdsp5/snd.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/qdsp5/snd.c 2010-12-31 14:46:53.000000000 -0500
@@ -242,7 +242,7 @@ err:
return rc;
}
@@ -29487,7 +29075,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.27/dri
.release = snd_release,
diff -urNp linux-2.6.32.27/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.27/drivers/staging/dream/smd/smd_qmi.c
--- linux-2.6.32.27/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/smd/smd_qmi.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/smd/smd_qmi.c 2010-12-31 14:46:53.000000000 -0500
@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
return 0;
}
@@ -29499,7 +29087,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.27/d
.write = qmi_write,
diff -urNp linux-2.6.32.27/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.27/drivers/staging/dream/smd/smd_rpcrouter_device.c
--- linux-2.6.32.27/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-12-31 14:46:53.000000000 -0500
@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
return rc;
}
@@ -29520,7 +29108,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
.release = rpcrouter_release,
diff -urNp linux-2.6.32.27/drivers/staging/dst/dcore.c linux-2.6.32.27/drivers/staging/dst/dcore.c
--- linux-2.6.32.27/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dst/dcore.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dst/dcore.c 2010-12-31 14:46:53.000000000 -0500
@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
return 0;
}
@@ -29541,7 +29129,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dst/dcore.c linux-2.6.32.27/drivers/s
err = dst_node_sysfs_init(n);
diff -urNp linux-2.6.32.27/drivers/staging/dst/trans.c linux-2.6.32.27/drivers/staging/dst/trans.c
--- linux-2.6.32.27/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/dst/trans.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/dst/trans.c 2010-12-31 14:46:53.000000000 -0500
@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
t->error = 0;
t->retries = 0;
@@ -29553,7 +29141,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/dst/trans.c linux-2.6.32.27/drivers/s
dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
diff -urNp linux-2.6.32.27/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.27/drivers/staging/go7007/go7007-v4l2.c
--- linux-2.6.32.27/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/go7007/go7007-v4l2.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/go7007/go7007-v4l2.c 2010-12-31 14:46:53.000000000 -0500
@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
return 0;
}
@@ -29565,7 +29153,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.27/
.fault = go7007_vm_fault,
diff -urNp linux-2.6.32.27/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.27/drivers/staging/hv/blkvsc_drv.c
--- linux-2.6.32.27/drivers/staging/hv/blkvsc_drv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/hv/blkvsc_drv.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/hv/blkvsc_drv.c 2010-12-31 14:46:53.000000000 -0500
@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
/* The one and only one */
static struct blkvsc_driver_context g_blkvsc_drv;
@@ -29577,7 +29165,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.27/drive
.release = blkvsc_release,
diff -urNp linux-2.6.32.27/drivers/staging/hv/Hv.c linux-2.6.32.27/drivers/staging/hv/Hv.c
--- linux-2.6.32.27/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/hv/Hv.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/hv/Hv.c 2010-12-31 14:46:53.000000000 -0500
@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
u32 outputAddressHi = outputAddress >> 32;
@@ -29589,7 +29177,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/hv/Hv.c linux-2.6.32.27/drivers/stagi
Control, Input, Output);
diff -urNp linux-2.6.32.27/drivers/staging/panel/panel.c linux-2.6.32.27/drivers/staging/panel/panel.c
--- linux-2.6.32.27/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/panel/panel.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/panel/panel.c 2010-12-31 14:46:53.000000000 -0500
@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
return 0;
}
@@ -29610,7 +29198,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/panel/panel.c linux-2.6.32.27/drivers
.release = keypad_release, /* close */
diff -urNp linux-2.6.32.27/drivers/staging/phison/phison.c linux-2.6.32.27/drivers/staging/phison/phison.c
--- linux-2.6.32.27/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/phison/phison.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/phison/phison.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -29622,7 +29210,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/phison/phison.c linux-2.6.32.27/drive
};
diff -urNp linux-2.6.32.27/drivers/staging/poch/poch.c linux-2.6.32.27/drivers/staging/poch/poch.c
--- linux-2.6.32.27/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/poch/poch.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/poch/poch.c 2010-12-31 14:46:53.000000000 -0500
@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
return 0;
}
@@ -29634,7 +29222,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/poch/poch.c linux-2.6.32.27/drivers/s
.release = poch_release,
diff -urNp linux-2.6.32.27/drivers/staging/pohmelfs/inode.c linux-2.6.32.27/drivers/staging/pohmelfs/inode.c
--- linux-2.6.32.27/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/pohmelfs/inode.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/pohmelfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -29646,7 +29234,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/pohmelfs/inode.c linux-2.6.32.27/driv
diff -urNp linux-2.6.32.27/drivers/staging/pohmelfs/mcache.c linux-2.6.32.27/drivers/staging/pohmelfs/mcache.c
--- linux-2.6.32.27/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/pohmelfs/mcache.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/pohmelfs/mcache.c 2010-12-31 14:46:53.000000000 -0500
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -29658,7 +29246,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/pohmelfs/mcache.c linux-2.6.32.27/dri
err = pohmelfs_mcache_insert(psb, m);
diff -urNp linux-2.6.32.27/drivers/staging/pohmelfs/netfs.h linux-2.6.32.27/drivers/staging/pohmelfs/netfs.h
--- linux-2.6.32.27/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/pohmelfs/netfs.h 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/pohmelfs/netfs.h 2010-12-31 14:46:53.000000000 -0500
@@ -570,7 +570,7 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -29670,7 +29258,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/pohmelfs/netfs.h linux-2.6.32.27/driv
unsigned int idx;
diff -urNp linux-2.6.32.27/drivers/staging/sep/sep_driver.c linux-2.6.32.27/drivers/staging/sep/sep_driver.c
--- linux-2.6.32.27/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/sep/sep_driver.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/sep/sep_driver.c 2010-12-31 14:46:53.000000000 -0500
@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
static dev_t sep_devno;
@@ -29682,7 +29270,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/sep/sep_driver.c linux-2.6.32.27/driv
.poll = sep_poll,
diff -urNp linux-2.6.32.27/drivers/staging/vme/devices/vme_user.c linux-2.6.32.27/drivers/staging/vme/devices/vme_user.c
--- linux-2.6.32.27/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/staging/vme/devices/vme_user.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/staging/vme/devices/vme_user.c 2010-12-31 14:46:53.000000000 -0500
@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
static int __init vme_user_probe(struct device *, int, int);
static int __exit vme_user_remove(struct device *, int, int);
@@ -29694,7 +29282,7 @@ diff -urNp linux-2.6.32.27/drivers/staging/vme/devices/vme_user.c linux-2.6.32.2
.read = vme_user_read,
diff -urNp linux-2.6.32.27/drivers/uio/uio.c linux-2.6.32.27/drivers/uio/uio.c
--- linux-2.6.32.27/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/uio/uio.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/uio/uio.c 2010-12-31 14:46:53.000000000 -0500
@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
return entry->show(mem, buf);
}
@@ -29715,7 +29303,7 @@ diff -urNp linux-2.6.32.27/drivers/uio/uio.c linux-2.6.32.27/drivers/uio/uio.c
diff -urNp linux-2.6.32.27/drivers/usb/atm/usbatm.c linux-2.6.32.27/drivers/usb/atm/usbatm.c
--- linux-2.6.32.27/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/atm/usbatm.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/atm/usbatm.c 2010-12-31 14:46:53.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",
@@ -29797,7 +29385,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/atm/usbatm.c linux-2.6.32.27/drivers/usb/
if (instance->disconnected)
diff -urNp linux-2.6.32.27/drivers/usb/class/cdc-acm.c linux-2.6.32.27/drivers/usb/class/cdc-acm.c
--- linux-2.6.32.27/drivers/usb/class/cdc-acm.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/class/cdc-acm.c 2010-12-09 18:12:36.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/class/cdc-acm.c 2010-12-31 14:46:53.000000000 -0500
@@ -1618,7 +1618,7 @@ static struct usb_device_id acm_ids[] =
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
USB_CDC_ACM_PROTO_AT_CDMA) },
@@ -29809,7 +29397,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/class/cdc-acm.c linux-2.6.32.27/drivers/u
MODULE_DEVICE_TABLE(usb, acm_ids);
diff -urNp linux-2.6.32.27/drivers/usb/class/cdc-wdm.c linux-2.6.32.27/drivers/usb/class/cdc-wdm.c
--- linux-2.6.32.27/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/class/cdc-wdm.c 2010-12-09 18:12:36.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/class/cdc-wdm.c 2010-12-31 14:46:53.000000000 -0500
@@ -314,7 +314,7 @@ static ssize_t wdm_write
if (r < 0)
goto outnp;
@@ -29821,7 +29409,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/class/cdc-wdm.c linux-2.6.32.27/drivers/u
else
diff -urNp linux-2.6.32.27/drivers/usb/class/usblp.c linux-2.6.32.27/drivers/usb/class/usblp.c
--- linux-2.6.32.27/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/class/usblp.c 2010-12-09 18:12:36.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/class/usblp.c 2010-12-31 14:46:53.000000000 -0500
@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -29842,7 +29430,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/class/usblp.c linux-2.6.32.27/drivers/usb
MODULE_DEVICE_TABLE (usb, usblp_ids);
diff -urNp linux-2.6.32.27/drivers/usb/core/hcd.c linux-2.6.32.27/drivers/usb/core/hcd.c
--- linux-2.6.32.27/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/core/hcd.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/core/hcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -29863,7 +29451,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/core/hcd.c linux-2.6.32.27/drivers/usb/co
if (mon_ops)
diff -urNp linux-2.6.32.27/drivers/usb/core/hcd.h linux-2.6.32.27/drivers/usb/core/hcd.h
--- linux-2.6.32.27/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/core/hcd.h 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/core/hcd.h 2010-12-31 14:46:53.000000000 -0500
@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -29893,7 +29481,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/core/hcd.h linux-2.6.32.27/drivers/usb/co
#else
diff -urNp linux-2.6.32.27/drivers/usb/core/hub.c linux-2.6.32.27/drivers/usb/core/hub.c
--- linux-2.6.32.27/drivers/usb/core/hub.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/drivers/usb/core/hub.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/core/hub.c 2010-12-31 14:46:53.000000000 -0500
@@ -3404,7 +3404,7 @@ static struct usb_device_id hub_id_table
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -29905,7 +29493,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/core/hub.c linux-2.6.32.27/drivers/usb/co
MODULE_DEVICE_TABLE (usb, hub_id_table);
diff -urNp linux-2.6.32.27/drivers/usb/core/message.c linux-2.6.32.27/drivers/usb/core/message.c
--- linux-2.6.32.27/drivers/usb/core/message.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/drivers/usb/core/message.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/core/message.c 2010-12-31 14:46:53.000000000 -0500
@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -29919,7 +29507,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/core/message.c linux-2.6.32.27/drivers/us
memcpy(smallbuf, buf, len);
diff -urNp linux-2.6.32.27/drivers/usb/host/ehci-pci.c linux-2.6.32.27/drivers/usb/host/ehci-pci.c
--- linux-2.6.32.27/drivers/usb/host/ehci-pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/host/ehci-pci.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/host/ehci-pci.c 2010-12-31 14:46:53.000000000 -0500
@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
.driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -29931,7 +29519,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/host/ehci-pci.c linux-2.6.32.27/drivers/u
diff -urNp linux-2.6.32.27/drivers/usb/host/uhci-hcd.c linux-2.6.32.27/drivers/usb/host/uhci-hcd.c
--- linux-2.6.32.27/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/host/uhci-hcd.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/host/uhci-hcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -29943,7 +29531,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/host/uhci-hcd.c linux-2.6.32.27/drivers/u
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
diff -urNp linux-2.6.32.27/drivers/usb/misc/appledisplay.c linux-2.6.32.27/drivers/usb/misc/appledisplay.c
--- linux-2.6.32.27/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/misc/appledisplay.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/misc/appledisplay.c 2010-12-31 14:46:53.000000000 -0500
@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
return pdata->msgdata[1];
}
@@ -29955,7 +29543,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/misc/appledisplay.c linux-2.6.32.27/drive
};
diff -urNp linux-2.6.32.27/drivers/usb/mon/mon_main.c linux-2.6.32.27/drivers/usb/mon/mon_main.c
--- linux-2.6.32.27/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/mon/mon_main.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/mon/mon_main.c 2010-12-31 14:46:53.000000000 -0500
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
/*
* Ops
@@ -29967,7 +29555,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/mon/mon_main.c linux-2.6.32.27/drivers/us
.urb_complete = mon_complete,
diff -urNp linux-2.6.32.27/drivers/usb/storage/debug.h linux-2.6.32.27/drivers/usb/storage/debug.h
--- linux-2.6.32.27/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/storage/debug.h 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/storage/debug.h 2010-12-31 14:46:53.000000000 -0500
@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
#define US_DEBUGPX(x...) printk( x )
#define US_DEBUG(x) x
@@ -29983,7 +29571,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/storage/debug.h linux-2.6.32.27/drivers/u
#endif
diff -urNp linux-2.6.32.27/drivers/usb/storage/usb.c linux-2.6.32.27/drivers/usb/storage/usb.c
--- linux-2.6.32.27/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/storage/usb.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/storage/usb.c 2010-12-31 14:46:53.000000000 -0500
@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -29995,7 +29583,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/storage/usb.c linux-2.6.32.27/drivers/usb
#undef UNUSUAL_DEV
diff -urNp linux-2.6.32.27/drivers/usb/storage/usual-tables.c linux-2.6.32.27/drivers/usb/storage/usual-tables.c
--- linux-2.6.32.27/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/usb/storage/usual-tables.c 2010-12-09 18:12:37.000000000 -0500
++++ linux-2.6.32.27/drivers/usb/storage/usual-tables.c 2010-12-31 14:46:53.000000000 -0500
@@ -48,7 +48,7 @@
struct usb_device_id usb_storage_usb_ids[] = {
@@ -30007,7 +29595,7 @@ diff -urNp linux-2.6.32.27/drivers/usb/storage/usual-tables.c linux-2.6.32.27/dr
diff -urNp linux-2.6.32.27/drivers/uwb/wlp/messages.c linux-2.6.32.27/drivers/uwb/wlp/messages.c
--- linux-2.6.32.27/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/uwb/wlp/messages.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/uwb/wlp/messages.c 2010-12-31 14:46:53.000000000 -0500
@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
size_t len = skb->len;
size_t used;
@@ -30019,7 +29607,7 @@ diff -urNp linux-2.6.32.27/drivers/uwb/wlp/messages.c linux-2.6.32.27/drivers/uw
char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
diff -urNp linux-2.6.32.27/drivers/uwb/wlp/sysfs.c linux-2.6.32.27/drivers/uwb/wlp/sysfs.c
--- linux-2.6.32.27/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/uwb/wlp/sysfs.c 2010-12-09 18:12:34.000000000 -0500
++++ linux-2.6.32.27/drivers/uwb/wlp/sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
return ret;
}
@@ -30032,7 +29620,7 @@ diff -urNp linux-2.6.32.27/drivers/uwb/wlp/sysfs.c linux-2.6.32.27/drivers/uwb/w
};
diff -urNp linux-2.6.32.27/drivers/video/atmel_lcdfb.c linux-2.6.32.27/drivers/video/atmel_lcdfb.c
--- linux-2.6.32.27/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/atmel_lcdfb.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/atmel_lcdfb.c 2010-12-31 14:46:53.000000000 -0500
@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
}
@@ -30044,7 +29632,7 @@ diff -urNp linux-2.6.32.27/drivers/video/atmel_lcdfb.c linux-2.6.32.27/drivers/v
};
diff -urNp linux-2.6.32.27/drivers/video/aty/aty128fb.c linux-2.6.32.27/drivers/video/aty/aty128fb.c
--- linux-2.6.32.27/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/aty/aty128fb.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/aty/aty128fb.c 2010-12-31 14:46:53.000000000 -0500
@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -30056,7 +29644,7 @@ diff -urNp linux-2.6.32.27/drivers/video/aty/aty128fb.c linux-2.6.32.27/drivers/
};
diff -urNp linux-2.6.32.27/drivers/video/aty/atyfb_base.c linux-2.6.32.27/drivers/video/aty/atyfb_base.c
--- linux-2.6.32.27/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/aty/atyfb_base.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/aty/atyfb_base.c 2010-12-31 14:46:53.000000000 -0500
@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -30068,7 +29656,7 @@ diff -urNp linux-2.6.32.27/drivers/video/aty/atyfb_base.c linux-2.6.32.27/driver
};
diff -urNp linux-2.6.32.27/drivers/video/aty/radeon_backlight.c linux-2.6.32.27/drivers/video/aty/radeon_backlight.c
--- linux-2.6.32.27/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/aty/radeon_backlight.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/aty/radeon_backlight.c 2010-12-31 14:46:53.000000000 -0500
@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -30080,7 +29668,7 @@ diff -urNp linux-2.6.32.27/drivers/video/aty/radeon_backlight.c linux-2.6.32.27/
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/adp5520_bl.c linux-2.6.32.27/drivers/video/backlight/adp5520_bl.c
--- linux-2.6.32.27/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/adp5520_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/adp5520_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
return error ? data->current_brightness : reg_val;
}
@@ -30092,7 +29680,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/adp5520_bl.c linux-2.6.32.27/
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/adx_bl.c linux-2.6.32.27/drivers/video/backlight/adx_bl.c
--- linux-2.6.32.27/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/adx_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/adx_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
return 1;
}
@@ -30104,7 +29692,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/adx_bl.c linux-2.6.32.27/driv
.get_brightness = adx_backlight_get_brightness,
diff -urNp linux-2.6.32.27/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.27/drivers/video/backlight/atmel-pwm-bl.c
--- linux-2.6.32.27/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/atmel-pwm-bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/atmel-pwm-bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
return pwm_channel_enable(&pwmbl->pwmc);
}
@@ -30116,7 +29704,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.2
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/backlight.c linux-2.6.32.27/drivers/video/backlight/backlight.c
--- linux-2.6.32.27/drivers/video/backlight/backlight.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/drivers/video/backlight/backlight.c 2010-12-09 18:30:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/backlight.c 2010-12-31 14:46:53.000000000 -0500
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
* ERR_PTR() or a pointer to the newly allocated device.
*/
@@ -30128,7 +29716,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/backlight.c linux-2.6.32.27/d
int rc;
diff -urNp linux-2.6.32.27/drivers/video/backlight/corgi_lcd.c linux-2.6.32.27/drivers/video/backlight/corgi_lcd.c
--- linux-2.6.32.27/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/corgi_lcd.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/corgi_lcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
}
EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -30140,7 +29728,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/corgi_lcd.c linux-2.6.32.27/d
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/cr_bllcd.c linux-2.6.32.27/drivers/video/backlight/cr_bllcd.c
--- linux-2.6.32.27/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/cr_bllcd.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/cr_bllcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
return intensity;
}
@@ -30152,7 +29740,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/cr_bllcd.c linux-2.6.32.27/dr
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/da903x_bl.c linux-2.6.32.27/drivers/video/backlight/da903x_bl.c
--- linux-2.6.32.27/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/da903x_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/da903x_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
return data->current_brightness;
}
@@ -30164,7 +29752,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/da903x_bl.c linux-2.6.32.27/d
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/generic_bl.c linux-2.6.32.27/drivers/video/backlight/generic_bl.c
--- linux-2.6.32.27/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/generic_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/generic_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
}
EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -30176,7 +29764,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/generic_bl.c linux-2.6.32.27/
.update_status = genericbl_send_intensity,
diff -urNp linux-2.6.32.27/drivers/video/backlight/hp680_bl.c linux-2.6.32.27/drivers/video/backlight/hp680_bl.c
--- linux-2.6.32.27/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/hp680_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/hp680_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
return current_intensity;
}
@@ -30188,7 +29776,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/hp680_bl.c linux-2.6.32.27/dr
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/jornada720_bl.c linux-2.6.32.27/drivers/video/backlight/jornada720_bl.c
--- linux-2.6.32.27/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/jornada720_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/jornada720_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -93,7 +93,7 @@ out:
return ret;
}
@@ -30200,7 +29788,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
.options = BL_CORE_SUSPENDRESUME,
diff -urNp linux-2.6.32.27/drivers/video/backlight/kb3886_bl.c linux-2.6.32.27/drivers/video/backlight/kb3886_bl.c
--- linux-2.6.32.27/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/kb3886_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/kb3886_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
return kb3886bl_intensity;
}
@@ -30212,7 +29800,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/kb3886_bl.c linux-2.6.32.27/d
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/locomolcd.c linux-2.6.32.27/drivers/video/backlight/locomolcd.c
--- linux-2.6.32.27/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/locomolcd.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/locomolcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
return current_intensity;
}
@@ -30224,7 +29812,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/locomolcd.c linux-2.6.32.27/d
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.27/drivers/video/backlight/mbp_nvidia_bl.c
--- linux-2.6.32.27/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/mbp_nvidia_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/mbp_nvidia_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -33,7 +33,7 @@ struct dmi_match_data {
unsigned long iostart;
unsigned long iolen;
@@ -30236,7 +29824,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
/* Module parameters. */
diff -urNp linux-2.6.32.27/drivers/video/backlight/omap1_bl.c linux-2.6.32.27/drivers/video/backlight/omap1_bl.c
--- linux-2.6.32.27/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/omap1_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/omap1_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
return bl->current_intensity;
}
@@ -30248,7 +29836,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/omap1_bl.c linux-2.6.32.27/dr
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/progear_bl.c linux-2.6.32.27/drivers/video/backlight/progear_bl.c
--- linux-2.6.32.27/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/progear_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/progear_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
return intensity - HW_LEVEL_MIN;
}
@@ -30260,7 +29848,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/progear_bl.c linux-2.6.32.27/
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/pwm_bl.c linux-2.6.32.27/drivers/video/backlight/pwm_bl.c
--- linux-2.6.32.27/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/pwm_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/pwm_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
return bl->props.brightness;
}
@@ -30272,7 +29860,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/pwm_bl.c linux-2.6.32.27/driv
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/tosa_bl.c linux-2.6.32.27/drivers/video/backlight/tosa_bl.c
--- linux-2.6.32.27/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/tosa_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/tosa_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
return props->brightness;
}
@@ -30284,7 +29872,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/tosa_bl.c linux-2.6.32.27/dri
};
diff -urNp linux-2.6.32.27/drivers/video/backlight/wm831x_bl.c linux-2.6.32.27/drivers/video/backlight/wm831x_bl.c
--- linux-2.6.32.27/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/backlight/wm831x_bl.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/backlight/wm831x_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
return data->current_brightness;
}
@@ -30296,7 +29884,7 @@ diff -urNp linux-2.6.32.27/drivers/video/backlight/wm831x_bl.c linux-2.6.32.27/d
.get_brightness = wm831x_backlight_get_brightness,
diff -urNp linux-2.6.32.27/drivers/video/bf54x-lq043fb.c linux-2.6.32.27/drivers/video/bf54x-lq043fb.c
--- linux-2.6.32.27/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/bf54x-lq043fb.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/bf54x-lq043fb.c 2010-12-31 14:46:53.000000000 -0500
@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -30308,7 +29896,7 @@ diff -urNp linux-2.6.32.27/drivers/video/bf54x-lq043fb.c linux-2.6.32.27/drivers
diff -urNp linux-2.6.32.27/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.27/drivers/video/bfin-t350mcqb-fb.c
--- linux-2.6.32.27/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/bfin-t350mcqb-fb.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/bfin-t350mcqb-fb.c 2010-12-31 14:46:53.000000000 -0500
@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -30320,7 +29908,7 @@ diff -urNp linux-2.6.32.27/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.27/driv
diff -urNp linux-2.6.32.27/drivers/video/fbcmap.c linux-2.6.32.27/drivers/video/fbcmap.c
--- linux-2.6.32.27/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/fbcmap.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/fbcmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
@@ -30333,7 +29921,7 @@ diff -urNp linux-2.6.32.27/drivers/video/fbcmap.c linux-2.6.32.27/drivers/video/
}
diff -urNp linux-2.6.32.27/drivers/video/fbmem.c linux-2.6.32.27/drivers/video/fbmem.c
--- linux-2.6.32.27/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/fbmem.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/fbmem.c 2010-12-31 14:46:53.000000000 -0500
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -30363,7 +29951,7 @@ diff -urNp linux-2.6.32.27/drivers/video/fbmem.c linux-2.6.32.27/drivers/video/f
request_module("fb%d", con2fb.framebuffer);
diff -urNp linux-2.6.32.27/drivers/video/fbmon.c linux-2.6.32.27/drivers/video/fbmon.c
--- linux-2.6.32.27/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/fbmon.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/fbmon.c 2010-12-31 14:46:53.000000000 -0500
@@ -45,7 +45,7 @@
#ifdef DEBUG
#define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -30375,7 +29963,7 @@ diff -urNp linux-2.6.32.27/drivers/video/fbmon.c linux-2.6.32.27/drivers/video/f
#define FBMON_FIX_HEADER 1
diff -urNp linux-2.6.32.27/drivers/video/i810/i810_accel.c linux-2.6.32.27/drivers/video/i810/i810_accel.c
--- linux-2.6.32.27/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/i810/i810_accel.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/i810/i810_accel.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -30386,7 +29974,7 @@ diff -urNp linux-2.6.32.27/drivers/video/i810/i810_accel.c linux-2.6.32.27/drive
info->pixmap.scan_align = 1;
diff -urNp linux-2.6.32.27/drivers/video/i810/i810_main.c linux-2.6.32.27/drivers/video/i810/i810_main.c
--- linux-2.6.32.27/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/i810/i810_main.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/i810/i810_main.c 2010-12-31 14:46:53.000000000 -0500
@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -30398,7 +29986,7 @@ diff -urNp linux-2.6.32.27/drivers/video/i810/i810_main.c linux-2.6.32.27/driver
static struct pci_driver i810fb_driver = {
diff -urNp linux-2.6.32.27/drivers/video/modedb.c linux-2.6.32.27/drivers/video/modedb.c
--- linux-2.6.32.27/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/modedb.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/modedb.c 2010-12-31 14:46:53.000000000 -0500
@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
{
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -30701,7 +30289,7 @@ diff -urNp linux-2.6.32.27/drivers/video/modedb.c linux-2.6.32.27/drivers/video/
diff -urNp linux-2.6.32.27/drivers/video/nvidia/nv_backlight.c linux-2.6.32.27/drivers/video/nvidia/nv_backlight.c
--- linux-2.6.32.27/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/nvidia/nv_backlight.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/nvidia/nv_backlight.c 2010-12-31 14:46:53.000000000 -0500
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -30713,7 +30301,7 @@ diff -urNp linux-2.6.32.27/drivers/video/nvidia/nv_backlight.c linux-2.6.32.27/d
};
diff -urNp linux-2.6.32.27/drivers/video/riva/fbdev.c linux-2.6.32.27/drivers/video/riva/fbdev.c
--- linux-2.6.32.27/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/riva/fbdev.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/riva/fbdev.c 2010-12-31 14:46:53.000000000 -0500
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -30725,7 +30313,7 @@ diff -urNp linux-2.6.32.27/drivers/video/riva/fbdev.c linux-2.6.32.27/drivers/vi
};
diff -urNp linux-2.6.32.27/drivers/video/uvesafb.c linux-2.6.32.27/drivers/video/uvesafb.c
--- linux-2.6.32.27/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/uvesafb.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/uvesafb.c 2010-12-31 14:46:53.000000000 -0500
@@ -18,6 +18,7 @@
#include <linux/fb.h>
#include <linux/io.h>
@@ -30803,7 +30391,7 @@ diff -urNp linux-2.6.32.27/drivers/video/uvesafb.c linux-2.6.32.27/drivers/video
framebuffer_release(info);
diff -urNp linux-2.6.32.27/drivers/video/vesafb.c linux-2.6.32.27/drivers/video/vesafb.c
--- linux-2.6.32.27/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/video/vesafb.c 2010-12-09 18:12:38.000000000 -0500
++++ linux-2.6.32.27/drivers/video/vesafb.c 2010-12-31 14:46:53.000000000 -0500
@@ -9,6 +9,7 @@
*/
@@ -30909,7 +30497,7 @@ diff -urNp linux-2.6.32.27/drivers/video/vesafb.c linux-2.6.32.27/drivers/video/
framebuffer_release(info);
diff -urNp linux-2.6.32.27/drivers/xen/sys-hypervisor.c linux-2.6.32.27/drivers/xen/sys-hypervisor.c
--- linux-2.6.32.27/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/drivers/xen/sys-hypervisor.c 2010-12-09 18:12:30.000000000 -0500
++++ linux-2.6.32.27/drivers/xen/sys-hypervisor.c 2010-12-31 14:46:53.000000000 -0500
@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
return 0;
}
@@ -30921,7 +30509,7 @@ diff -urNp linux-2.6.32.27/drivers/xen/sys-hypervisor.c linux-2.6.32.27/drivers/
};
diff -urNp linux-2.6.32.27/fs/9p/vfs_inode.c linux-2.6.32.27/fs/9p/vfs_inode.c
--- linux-2.6.32.27/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/9p/vfs_inode.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/fs/9p/vfs_inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
static void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -30933,7 +30521,7 @@ diff -urNp linux-2.6.32.27/fs/9p/vfs_inode.c linux-2.6.32.27/fs/9p/vfs_inode.c
IS_ERR(s) ? "<error>" : s);
diff -urNp linux-2.6.32.27/fs/aio.c linux-2.6.32.27/fs/aio.c
--- linux-2.6.32.27/fs/aio.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/fs/aio.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/aio.c 2010-12-31 14:46:53.000000000 -0500
@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -30945,7 +30533,7 @@ diff -urNp linux-2.6.32.27/fs/aio.c linux-2.6.32.27/fs/aio.c
nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
diff -urNp linux-2.6.32.27/fs/attr.c linux-2.6.32.27/fs/attr.c
--- linux-2.6.32.27/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/attr.c 2010-12-09 18:12:46.000000000 -0500
++++ linux-2.6.32.27/fs/attr.c 2010-12-31 14:46:53.000000000 -0500
@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -30956,7 +30544,7 @@ diff -urNp linux-2.6.32.27/fs/attr.c linux-2.6.32.27/fs/attr.c
if (offset > inode->i_sb->s_maxbytes)
diff -urNp linux-2.6.32.27/fs/autofs/root.c linux-2.6.32.27/fs/autofs/root.c
--- linux-2.6.32.27/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/autofs/root.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/autofs/root.c 2010-12-31 14:46:53.000000000 -0500
@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -30969,7 +30557,7 @@ diff -urNp linux-2.6.32.27/fs/autofs/root.c linux-2.6.32.27/fs/autofs/root.c
unlock_kernel();
diff -urNp linux-2.6.32.27/fs/autofs4/symlink.c linux-2.6.32.27/fs/autofs4/symlink.c
--- linux-2.6.32.27/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/autofs4/symlink.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/fs/autofs4/symlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -30981,7 +30569,7 @@ diff -urNp linux-2.6.32.27/fs/autofs4/symlink.c linux-2.6.32.27/fs/autofs4/symli
diff -urNp linux-2.6.32.27/fs/befs/linuxvfs.c linux-2.6.32.27/fs/befs/linuxvfs.c
--- linux-2.6.32.27/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/befs/linuxvfs.c 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/befs/linuxvfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -30993,7 +30581,7 @@ diff -urNp linux-2.6.32.27/fs/befs/linuxvfs.c linux-2.6.32.27/fs/befs/linuxvfs.c
}
diff -urNp linux-2.6.32.27/fs/binfmt_aout.c linux-2.6.32.27/fs/binfmt_aout.c
--- linux-2.6.32.27/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/binfmt_aout.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/binfmt_aout.c 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -31083,7 +30671,7 @@ diff -urNp linux-2.6.32.27/fs/binfmt_aout.c linux-2.6.32.27/fs/binfmt_aout.c
up_write(&current->mm->mmap_sem);
diff -urNp linux-2.6.32.27/fs/binfmt_elf.c linux-2.6.32.27/fs/binfmt_elf.c
--- linux-2.6.32.27/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/binfmt_elf.c 2010-12-09 18:12:46.000000000 -0500
++++ linux-2.6.32.27/fs/binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
#define elf_core_dump NULL
#endif
@@ -31721,7 +31309,7 @@ diff -urNp linux-2.6.32.27/fs/binfmt_elf.c linux-2.6.32.27/fs/binfmt_elf.c
return register_binfmt(&elf_format);
diff -urNp linux-2.6.32.27/fs/binfmt_flat.c linux-2.6.32.27/fs/binfmt_flat.c
--- linux-2.6.32.27/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/binfmt_flat.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/binfmt_flat.c 2010-12-31 14:46:53.000000000 -0500
@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
@@ -31756,7 +31344,7 @@ diff -urNp linux-2.6.32.27/fs/binfmt_flat.c linux-2.6.32.27/fs/binfmt_flat.c
}
diff -urNp linux-2.6.32.27/fs/binfmt_misc.c linux-2.6.32.27/fs/binfmt_misc.c
--- linux-2.6.32.27/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/fs/binfmt_misc.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/binfmt_misc.c 2010-12-31 14:46:53.000000000 -0500
@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -31768,7 +31356,7 @@ diff -urNp linux-2.6.32.27/fs/binfmt_misc.c linux-2.6.32.27/fs/binfmt_misc.c
if (!err)
diff -urNp linux-2.6.32.27/fs/bio.c linux-2.6.32.27/fs/bio.c
--- linux-2.6.32.27/fs/bio.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/fs/bio.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/bio.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
i = 0;
@@ -31789,7 +31377,7 @@ diff -urNp linux-2.6.32.27/fs/bio.c linux-2.6.32.27/fs/bio.c
char *addr = page_address(bvec->bv_page);
diff -urNp linux-2.6.32.27/fs/block_dev.c linux-2.6.32.27/fs/block_dev.c
--- linux-2.6.32.27/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/block_dev.c 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/block_dev.c 2010-12-31 14:46:53.000000000 -0500
@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
else if (bdev->bd_contains == bdev)
res = 0; /* is a whole device which isn't held */
@@ -31801,7 +31389,7 @@ diff -urNp linux-2.6.32.27/fs/block_dev.c linux-2.6.32.27/fs/block_dev.c
res = -EBUSY; /* is a partition of a held device */
diff -urNp linux-2.6.32.27/fs/btrfs/ctree.c linux-2.6.32.27/fs/btrfs/ctree.c
--- linux-2.6.32.27/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/btrfs/ctree.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/btrfs/ctree.c 2010-12-31 14:46:53.000000000 -0500
@@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
free_extent_buffer(buf);
add_root_to_dirty_list(root);
@@ -31828,7 +31416,7 @@ diff -urNp linux-2.6.32.27/fs/btrfs/ctree.c linux-2.6.32.27/fs/btrfs/ctree.c
}
diff -urNp linux-2.6.32.27/fs/btrfs/disk-io.c linux-2.6.32.27/fs/btrfs/disk-io.c
--- linux-2.6.32.27/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/btrfs/disk-io.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/btrfs/disk-io.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,7 +39,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
@@ -31849,7 +31437,7 @@ diff -urNp linux-2.6.32.27/fs/btrfs/disk-io.c linux-2.6.32.27/fs/btrfs/disk-io.c
.submit_bio_hook = btree_submit_bio_hook,
diff -urNp linux-2.6.32.27/fs/btrfs/extent_io.h linux-2.6.32.27/fs/btrfs/extent_io.h
--- linux-2.6.32.27/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/btrfs/extent_io.h 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/btrfs/extent_io.h 2010-12-31 14:46:53.000000000 -0500
@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags);
@@ -31912,7 +31500,7 @@ diff -urNp linux-2.6.32.27/fs/btrfs/extent_io.h linux-2.6.32.27/fs/btrfs/extent_
struct extent_state {
diff -urNp linux-2.6.32.27/fs/btrfs/free-space-cache.c linux-2.6.32.27/fs/btrfs/free-space-cache.c
--- linux-2.6.32.27/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/btrfs/free-space-cache.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/btrfs/free-space-cache.c 2010-12-31 14:46:53.000000000 -0500
@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
@@ -31933,7 +31521,7 @@ diff -urNp linux-2.6.32.27/fs/btrfs/free-space-cache.c linux-2.6.32.27/fs/btrfs/
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
diff -urNp linux-2.6.32.27/fs/btrfs/inode.c linux-2.6.32.27/fs/btrfs/inode.c
--- linux-2.6.32.27/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/btrfs/inode.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/btrfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,7 +63,7 @@ static const struct inode_operations btr
static const struct address_space_operations btrfs_aops;
static const struct address_space_operations btrfs_symlink_aops;
@@ -31954,7 +31542,7 @@ diff -urNp linux-2.6.32.27/fs/btrfs/inode.c linux-2.6.32.27/fs/btrfs/inode.c
.merge_bio_hook = btrfs_merge_bio_hook,
diff -urNp linux-2.6.32.27/fs/btrfs/relocation.c linux-2.6.32.27/fs/btrfs/relocation.c
--- linux-2.6.32.27/fs/btrfs/relocation.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/btrfs/relocation.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/btrfs/relocation.c 2010-12-31 14:46:53.000000000 -0500
@@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt
}
spin_unlock(&rc->reloc_root_tree.lock);
@@ -31966,7 +31554,7 @@ diff -urNp linux-2.6.32.27/fs/btrfs/relocation.c linux-2.6.32.27/fs/btrfs/reloca
spin_lock(&rc->reloc_root_tree.lock);
diff -urNp linux-2.6.32.27/fs/btrfs/sysfs.c linux-2.6.32.27/fs/btrfs/sysfs.c
--- linux-2.6.32.27/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/btrfs/sysfs.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/btrfs/sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
complete(&root->kobj_unregister);
}
@@ -31984,7 +31572,7 @@ diff -urNp linux-2.6.32.27/fs/btrfs/sysfs.c linux-2.6.32.27/fs/btrfs/sysfs.c
};
diff -urNp linux-2.6.32.27/fs/buffer.c linux-2.6.32.27/fs/buffer.c
--- linux-2.6.32.27/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/buffer.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/fs/buffer.c 2010-12-31 14:46:53.000000000 -0500
@@ -25,6 +25,7 @@
#include <linux/percpu.h>
#include <linux/slab.h>
@@ -31995,7 +31583,7 @@ diff -urNp linux-2.6.32.27/fs/buffer.c linux-2.6.32.27/fs/buffer.c
#include <linux/quotaops.h>
diff -urNp linux-2.6.32.27/fs/cachefiles/bind.c linux-2.6.32.27/fs/cachefiles/bind.c
--- linux-2.6.32.27/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/cachefiles/bind.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/cachefiles/bind.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
@@ -32014,7 +31602,7 @@ diff -urNp linux-2.6.32.27/fs/cachefiles/bind.c linux-2.6.32.27/fs/cachefiles/bi
diff -urNp linux-2.6.32.27/fs/cachefiles/daemon.c linux-2.6.32.27/fs/cachefiles/daemon.c
--- linux-2.6.32.27/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/cachefiles/daemon.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/cachefiles/daemon.c 2010-12-31 14:46:53.000000000 -0500
@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
if (test_bit(CACHEFILES_DEAD, &cache->flags))
return -EIO;
@@ -32044,7 +31632,7 @@ diff -urNp linux-2.6.32.27/fs/cachefiles/daemon.c linux-2.6.32.27/fs/cachefiles/
cache->bstop_percent = bstop;
diff -urNp linux-2.6.32.27/fs/cachefiles/rdwr.c linux-2.6.32.27/fs/cachefiles/rdwr.c
--- linux-2.6.32.27/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/cachefiles/rdwr.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/cachefiles/rdwr.c 2010-12-31 14:46:53.000000000 -0500
@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -32056,7 +31644,7 @@ diff -urNp linux-2.6.32.27/fs/cachefiles/rdwr.c linux-2.6.32.27/fs/cachefiles/rd
if (ret != len)
diff -urNp linux-2.6.32.27/fs/cifs/cifs_uniupr.h linux-2.6.32.27/fs/cifs/cifs_uniupr.h
--- linux-2.6.32.27/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/cifs/cifs_uniupr.h 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/cifs/cifs_uniupr.h 2010-12-31 14:46:53.000000000 -0500
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -32068,7 +31656,7 @@ diff -urNp linux-2.6.32.27/fs/cifs/cifs_uniupr.h linux-2.6.32.27/fs/cifs/cifs_un
diff -urNp linux-2.6.32.27/fs/cifs/link.c linux-2.6.32.27/fs/cifs/link.c
--- linux-2.6.32.27/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/cifs/link.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/cifs/link.c 2010-12-31 14:46:53.000000000 -0500
@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -32080,7 +31668,7 @@ diff -urNp linux-2.6.32.27/fs/cifs/link.c linux-2.6.32.27/fs/cifs/link.c
}
diff -urNp linux-2.6.32.27/fs/compat_binfmt_elf.c linux-2.6.32.27/fs/compat_binfmt_elf.c
--- linux-2.6.32.27/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/compat_binfmt_elf.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/fs/compat_binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,10 +29,12 @@
#undef elfhdr
#undef elf_phdr
@@ -32096,8 +31684,89 @@ diff -urNp linux-2.6.32.27/fs/compat_binfmt_elf.c linux-2.6.32.27/fs/compat_binf
/*
diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
--- linux-2.6.32.27/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/compat.c 2010-12-09 18:12:51.000000000 -0500
-@@ -1098,7 +1098,7 @@ static ssize_t compat_do_readv_writev(in
++++ linux-2.6.32.27/fs/compat.c 2011-01-01 00:34:30.000000000 -0500
+@@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
+
+ struct compat_readdir_callback {
+ struct compat_old_linux_dirent __user *dirent;
++ struct file * file;
+ int result;
+ };
+
+@@ -847,6 +848,10 @@ static int compat_fillonedir(void *__buf
+ buf->result = -EOVERFLOW;
+ return -EOVERFLOW;
+ }
++
++ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
++ return 0;
++
+ buf->result++;
+ dirent = buf->dirent;
+ if (!access_ok(VERIFY_WRITE, dirent,
+@@ -879,6 +884,7 @@ asmlinkage long compat_sys_old_readdir(u
+
+ buf.result = 0;
+ buf.dirent = dirent;
++ buf.file = file;
+
+ error = vfs_readdir(file, compat_fillonedir, &buf);
+ if (buf.result)
+@@ -899,6 +905,7 @@ struct compat_linux_dirent {
+ struct compat_getdents_callback {
+ struct compat_linux_dirent __user *current_dir;
+ struct compat_linux_dirent __user *previous;
++ struct file * file;
+ int count;
+ int error;
+ };
+@@ -919,6 +926,10 @@ static int compat_filldir(void *__buf, c
+ buf->error = -EOVERFLOW;
+ return -EOVERFLOW;
+ }
++
++ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
++ return 0;
++
+ dirent = buf->previous;
+ if (dirent) {
+ if (__put_user(offset, &dirent->d_off))
+@@ -966,6 +977,7 @@ asmlinkage long compat_sys_getdents(unsi
+ buf.previous = NULL;
+ buf.count = count;
+ buf.error = 0;
++ buf.file = file;
+
+ error = vfs_readdir(file, compat_filldir, &buf);
+ if (error >= 0)
+@@ -987,6 +999,7 @@ out:
+ struct compat_getdents_callback64 {
+ struct linux_dirent64 __user *current_dir;
+ struct linux_dirent64 __user *previous;
++ struct file * file;
+ int count;
+ int error;
+ };
+@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf
+ buf->error = -EINVAL; /* only used if we fail.. */
+ if (reclen > buf->count)
+ return -EINVAL;
++
++ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
++ return 0;
++
+ dirent = buf->previous;
+
+ if (dirent) {
+@@ -1054,6 +1071,7 @@ asmlinkage long compat_sys_getdents64(un
+ buf.previous = NULL;
+ buf.count = count;
+ buf.error = 0;
++ buf.file = file;
+
+ error = vfs_readdir(file, compat_filldir64, &buf);
+ if (error >= 0)
+@@ -1098,7 +1116,7 @@ static ssize_t compat_do_readv_writev(in
* verify all the pointers
*/
ret = -EINVAL;
@@ -32106,7 +31775,7 @@ diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
goto out;
if (!file->f_op)
goto out;
-@@ -1353,6 +1353,10 @@ static int compat_count(compat_uptr_t __
+@@ -1353,6 +1371,10 @@ static int compat_count(compat_uptr_t __
argv++;
if (i++ >= max)
return -E2BIG;
@@ -32117,7 +31786,7 @@ diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
}
}
return i;
-@@ -1394,6 +1398,12 @@ static int compat_copy_strings(int argc,
+@@ -1394,6 +1416,12 @@ static int compat_copy_strings(int argc,
while (len > 0) {
int offset, bytes_to_copy;
@@ -32130,7 +31799,7 @@ diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
offset = pos % PAGE_SIZE;
if (offset == 0)
offset = PAGE_SIZE;
-@@ -1410,17 +1420,8 @@ static int compat_copy_strings(int argc,
+@@ -1410,17 +1438,8 @@ static int compat_copy_strings(int argc,
if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
struct page *page;
@@ -32150,7 +31819,7 @@ diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
/* We've exceed the stack rlimit. */
ret = -E2BIG;
goto out;
-@@ -1463,6 +1464,11 @@ int compat_do_execve(char * filename,
+@@ -1463,6 +1482,11 @@ int compat_do_execve(char * filename,
compat_uptr_t __user *envp,
struct pt_regs * regs)
{
@@ -32162,7 +31831,7 @@ diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
-@@ -1499,6 +1505,14 @@ int compat_do_execve(char * filename,
+@@ -1499,6 +1523,14 @@ int compat_do_execve(char * filename,
bprm->filename = filename;
bprm->interp = filename;
@@ -32177,7 +31846,7 @@ diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1528,9 +1542,40 @@ int compat_do_execve(char * filename,
+@@ -1528,9 +1560,40 @@ int compat_do_execve(char * filename,
if (retval < 0)
goto out;
@@ -32219,7 +31888,7 @@ diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
/* execve succeeded */
current->fs->in_exec = 0;
-@@ -1541,9 +1586,19 @@ int compat_do_execve(char * filename,
+@@ -1541,9 +1604,19 @@ int compat_do_execve(char * filename,
put_files_struct(displaced);
return retval;
@@ -32242,7 +31911,7 @@ diff -urNp linux-2.6.32.27/fs/compat.c linux-2.6.32.27/fs/compat.c
if (bprm->file) {
diff -urNp linux-2.6.32.27/fs/compat_ioctl.c linux-2.6.32.27/fs/compat_ioctl.c
--- linux-2.6.32.27/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/compat_ioctl.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/compat_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi
up = (struct compat_video_spu_palette __user *) arg;
err = get_user(palp, &up->palette);
@@ -32273,7 +31942,7 @@ diff -urNp linux-2.6.32.27/fs/compat_ioctl.c linux-2.6.32.27/fs/compat_ioctl.c
Valid reasons to use this:
diff -urNp linux-2.6.32.27/fs/debugfs/inode.c linux-2.6.32.27/fs/debugfs/inode.c
--- linux-2.6.32.27/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/debugfs/inode.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/debugfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -32285,7 +31954,7 @@ diff -urNp linux-2.6.32.27/fs/debugfs/inode.c linux-2.6.32.27/fs/debugfs/inode.c
}
diff -urNp linux-2.6.32.27/fs/dlm/lockspace.c linux-2.6.32.27/fs/dlm/lockspace.c
--- linux-2.6.32.27/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/dlm/lockspace.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/fs/dlm/lockspace.c 2010-12-31 14:46:53.000000000 -0500
@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
kfree(ls);
}
@@ -32297,7 +31966,7 @@ diff -urNp linux-2.6.32.27/fs/dlm/lockspace.c linux-2.6.32.27/fs/dlm/lockspace.c
};
diff -urNp linux-2.6.32.27/fs/ecryptfs/inode.c linux-2.6.32.27/fs/ecryptfs/inode.c
--- linux-2.6.32.27/fs/ecryptfs/inode.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/fs/ecryptfs/inode.c 2010-12-09 18:30:40.000000000 -0500
++++ linux-2.6.32.27/fs/ecryptfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
@@ -32318,7 +31987,7 @@ diff -urNp linux-2.6.32.27/fs/ecryptfs/inode.c linux-2.6.32.27/fs/ecryptfs/inode
goto out_free;
diff -urNp linux-2.6.32.27/fs/exec.c linux-2.6.32.27/fs/exec.c
--- linux-2.6.32.27/fs/exec.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/fs/exec.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/exec.c 2010-12-31 14:46:53.000000000 -0500
@@ -56,12 +56,24 @@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
@@ -32918,7 +32587,7 @@ diff -urNp linux-2.6.32.27/fs/exec.c linux-2.6.32.27/fs/exec.c
* uses lock_kernel()
diff -urNp linux-2.6.32.27/fs/ext2/balloc.c linux-2.6.32.27/fs/ext2/balloc.c
--- linux-2.6.32.27/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ext2/balloc.c 2010-12-09 18:12:47.000000000 -0500
++++ linux-2.6.32.27/fs/ext2/balloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -32930,7 +32599,7 @@ diff -urNp linux-2.6.32.27/fs/ext2/balloc.c linux-2.6.32.27/fs/ext2/balloc.c
return 0;
diff -urNp linux-2.6.32.27/fs/ext2/xattr.c linux-2.6.32.27/fs/ext2/xattr.c
--- linux-2.6.32.27/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ext2/xattr.c 2010-12-09 18:12:46.000000000 -0500
++++ linux-2.6.32.27/fs/ext2/xattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -85,8 +85,8 @@
printk("\n"); \
} while (0)
@@ -32944,7 +32613,7 @@ diff -urNp linux-2.6.32.27/fs/ext2/xattr.c linux-2.6.32.27/fs/ext2/xattr.c
static int ext2_xattr_set2(struct inode *, struct buffer_head *,
diff -urNp linux-2.6.32.27/fs/ext3/balloc.c linux-2.6.32.27/fs/ext3/balloc.c
--- linux-2.6.32.27/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ext3/balloc.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/ext3/balloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -32956,7 +32625,7 @@ diff -urNp linux-2.6.32.27/fs/ext3/balloc.c linux-2.6.32.27/fs/ext3/balloc.c
return 0;
diff -urNp linux-2.6.32.27/fs/ext3/namei.c linux-2.6.32.27/fs/ext3/namei.c
--- linux-2.6.32.27/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ext3/namei.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/ext3/namei.c 2010-12-31 14:46:53.000000000 -0500
@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -32968,7 +32637,7 @@ diff -urNp linux-2.6.32.27/fs/ext3/namei.c linux-2.6.32.27/fs/ext3/namei.c
if (!(bh2)) {
diff -urNp linux-2.6.32.27/fs/ext3/xattr.c linux-2.6.32.27/fs/ext3/xattr.c
--- linux-2.6.32.27/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ext3/xattr.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/ext3/xattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,8 +89,8 @@
printk("\n"); \
} while (0)
@@ -32982,7 +32651,7 @@ diff -urNp linux-2.6.32.27/fs/ext3/xattr.c linux-2.6.32.27/fs/ext3/xattr.c
static void ext3_xattr_cache_insert(struct buffer_head *);
diff -urNp linux-2.6.32.27/fs/ext4/balloc.c linux-2.6.32.27/fs/ext4/balloc.c
--- linux-2.6.32.27/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.27/fs/ext4/balloc.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/ext4/balloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
@@ -32994,7 +32663,7 @@ diff -urNp linux-2.6.32.27/fs/ext4/balloc.c linux-2.6.32.27/fs/ext4/balloc.c
}
diff -urNp linux-2.6.32.27/fs/ext4/namei.c linux-2.6.32.27/fs/ext4/namei.c
--- linux-2.6.32.27/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ext4/namei.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/ext4/namei.c 2010-12-31 14:46:53.000000000 -0500
@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -33006,7 +32675,7 @@ diff -urNp linux-2.6.32.27/fs/ext4/namei.c linux-2.6.32.27/fs/ext4/namei.c
if (!(bh2)) {
diff -urNp linux-2.6.32.27/fs/ext4/super.c linux-2.6.32.27/fs/ext4/super.c
--- linux-2.6.32.27/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ext4/super.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/ext4/super.c 2010-12-31 14:46:53.000000000 -0500
@@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
}
@@ -33018,7 +32687,7 @@ diff -urNp linux-2.6.32.27/fs/ext4/super.c linux-2.6.32.27/fs/ext4/super.c
};
diff -urNp linux-2.6.32.27/fs/ext4/xattr.c linux-2.6.32.27/fs/ext4/xattr.c
--- linux-2.6.32.27/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ext4/xattr.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/ext4/xattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -82,8 +82,8 @@
printk("\n"); \
} while (0)
@@ -33032,7 +32701,7 @@ diff -urNp linux-2.6.32.27/fs/ext4/xattr.c linux-2.6.32.27/fs/ext4/xattr.c
static void ext4_xattr_cache_insert(struct buffer_head *);
diff -urNp linux-2.6.32.27/fs/fcntl.c linux-2.6.32.27/fs/fcntl.c
--- linux-2.6.32.27/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/fcntl.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/fcntl.c 2010-12-31 14:46:53.000000000 -0500
@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
@@ -33055,7 +32724,7 @@ diff -urNp linux-2.6.32.27/fs/fcntl.c linux-2.6.32.27/fs/fcntl.c
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
diff -urNp linux-2.6.32.27/fs/fifo.c linux-2.6.32.27/fs/fifo.c
--- linux-2.6.32.27/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/fifo.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/fifo.c 2010-12-31 14:46:53.000000000 -0500
@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
@@ -33128,7 +32797,7 @@ diff -urNp linux-2.6.32.27/fs/fifo.c linux-2.6.32.27/fs/fifo.c
err_nocleanup:
diff -urNp linux-2.6.32.27/fs/file.c linux-2.6.32.27/fs/file.c
--- linux-2.6.32.27/fs/file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/file.c 2010-12-09 18:12:46.000000000 -0500
++++ linux-2.6.32.27/fs/file.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -33148,7 +32817,7 @@ diff -urNp linux-2.6.32.27/fs/file.c linux-2.6.32.27/fs/file.c
diff -urNp linux-2.6.32.27/fs/fs_struct.c linux-2.6.32.27/fs/fs_struct.c
--- linux-2.6.32.27/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/fs_struct.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/fs/fs_struct.c 2010-12-31 14:46:53.000000000 -0500
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -33230,7 +32899,7 @@ diff -urNp linux-2.6.32.27/fs/fs_struct.c linux-2.6.32.27/fs/fs_struct.c
task_unlock(current);
diff -urNp linux-2.6.32.27/fs/fuse/control.c linux-2.6.32.27/fs/fuse/control.c
--- linux-2.6.32.27/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/fuse/control.c 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/fuse/control.c 2010-12-31 14:46:53.000000000 -0500
@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -33242,7 +32911,7 @@ diff -urNp linux-2.6.32.27/fs/fuse/control.c linux-2.6.32.27/fs/fuse/control.c
diff -urNp linux-2.6.32.27/fs/fuse/cuse.c linux-2.6.32.27/fs/fuse/cuse.c
--- linux-2.6.32.27/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/fuse/cuse.c 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/fuse/cuse.c 2010-12-31 14:46:53.000000000 -0500
@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
return rc;
}
@@ -33279,7 +32948,7 @@ diff -urNp linux-2.6.32.27/fs/fuse/cuse.c linux-2.6.32.27/fs/fuse/cuse.c
return PTR_ERR(cuse_class);
diff -urNp linux-2.6.32.27/fs/fuse/dev.c linux-2.6.32.27/fs/fuse/dev.c
--- linux-2.6.32.27/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/fs/fuse/dev.c 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/fuse/dev.c 2010-12-31 14:46:53.000000000 -0500
@@ -745,7 +745,7 @@ __releases(&fc->lock)
* request_end(). Otherwise add it to the processing list, and set
* the 'sent' flag.
@@ -33387,7 +33056,7 @@ diff -urNp linux-2.6.32.27/fs/fuse/dev.c linux-2.6.32.27/fs/fuse/dev.c
.owner = THIS_MODULE,
diff -urNp linux-2.6.32.27/fs/fuse/dir.c linux-2.6.32.27/fs/fuse/dir.c
--- linux-2.6.32.27/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/fuse/dir.c 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/fuse/dir.c 2010-12-31 14:46:53.000000000 -0500
@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -33399,7 +33068,7 @@ diff -urNp linux-2.6.32.27/fs/fuse/dir.c linux-2.6.32.27/fs/fuse/dir.c
free_page((unsigned long) link);
diff -urNp linux-2.6.32.27/fs/fuse/fuse_i.h linux-2.6.32.27/fs/fuse/fuse_i.h
--- linux-2.6.32.27/fs/fuse/fuse_i.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/fuse/fuse_i.h 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/fuse/fuse_i.h 2010-12-31 14:46:53.000000000 -0500
@@ -521,6 +521,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
@@ -33419,7 +33088,7 @@ diff -urNp linux-2.6.32.27/fs/fuse/fuse_i.h linux-2.6.32.27/fs/fuse/fuse_i.h
*/
diff -urNp linux-2.6.32.27/fs/gfs2/sys.c linux-2.6.32.27/fs/gfs2/sys.c
--- linux-2.6.32.27/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/gfs2/sys.c 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/gfs2/sys.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
return a->store ? a->store(sdp, buf, len) : len;
}
@@ -33440,7 +33109,7 @@ diff -urNp linux-2.6.32.27/fs/gfs2/sys.c linux-2.6.32.27/fs/gfs2/sys.c
diff -urNp linux-2.6.32.27/fs/hfs/inode.c linux-2.6.32.27/fs/hfs/inode.c
--- linux-2.6.32.27/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/hfs/inode.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/fs/hfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
@@ -33461,7 +33130,7 @@ diff -urNp linux-2.6.32.27/fs/hfs/inode.c linux-2.6.32.27/fs/hfs/inode.c
if (rec.type != HFS_CDR_FIL ||
diff -urNp linux-2.6.32.27/fs/hfsplus/inode.c linux-2.6.32.27/fs/hfsplus/inode.c
--- linux-2.6.32.27/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/hfsplus/inode.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/hfsplus/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
@@ -33500,7 +33169,7 @@ diff -urNp linux-2.6.32.27/fs/hfsplus/inode.c linux-2.6.32.27/fs/hfsplus/inode.c
hfsplus_inode_write_fork(inode, &file->data_fork);
diff -urNp linux-2.6.32.27/fs/hugetlbfs/inode.c linux-2.6.32.27/fs/hugetlbfs/inode.c
--- linux-2.6.32.27/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/hugetlbfs/inode.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/hugetlbfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
@@ -33512,7 +33181,7 @@ diff -urNp linux-2.6.32.27/fs/hugetlbfs/inode.c linux-2.6.32.27/fs/hugetlbfs/ino
{
diff -urNp linux-2.6.32.27/fs/ioctl.c linux-2.6.32.27/fs/ioctl.c
--- linux-2.6.32.27/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ioctl.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
u64 phys, u64 len, u32 flags)
{
@@ -33542,7 +33211,7 @@ diff -urNp linux-2.6.32.27/fs/ioctl.c linux-2.6.32.27/fs/ioctl.c
return error;
diff -urNp linux-2.6.32.27/fs/jffs2/debug.h linux-2.6.32.27/fs/jffs2/debug.h
--- linux-2.6.32.27/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/jffs2/debug.h 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/jffs2/debug.h 2010-12-31 14:46:53.000000000 -0500
@@ -52,13 +52,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
@@ -33646,7 +33315,7 @@ diff -urNp linux-2.6.32.27/fs/jffs2/debug.h linux-2.6.32.27/fs/jffs2/debug.h
/* "Sanity" checks */
diff -urNp linux-2.6.32.27/fs/jffs2/erase.c linux-2.6.32.27/fs/jffs2/erase.c
--- linux-2.6.32.27/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/jffs2/erase.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/jffs2/erase.c 2010-12-31 14:46:53.000000000 -0500
@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -33659,7 +33328,7 @@ diff -urNp linux-2.6.32.27/fs/jffs2/erase.c linux-2.6.32.27/fs/jffs2/erase.c
jffs2_prealloc_raw_node_refs(c, jeb, 1);
diff -urNp linux-2.6.32.27/fs/jffs2/summary.h linux-2.6.32.27/fs/jffs2/summary.h
--- linux-2.6.32.27/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/jffs2/summary.h 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/jffs2/summary.h 2010-12-31 14:46:53.000000000 -0500
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
#define jffs2_sum_active() (0)
@@ -33690,7 +33359,7 @@ diff -urNp linux-2.6.32.27/fs/jffs2/summary.h linux-2.6.32.27/fs/jffs2/summary.h
#endif /* CONFIG_JFFS2_SUMMARY */
diff -urNp linux-2.6.32.27/fs/jffs2/wbuf.c linux-2.6.32.27/fs/jffs2/wbuf.c
--- linux-2.6.32.27/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/jffs2/wbuf.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/jffs2/wbuf.c 2010-12-31 14:46:53.000000000 -0500
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -33703,7 +33372,7 @@ diff -urNp linux-2.6.32.27/fs/jffs2/wbuf.c linux-2.6.32.27/fs/jffs2/wbuf.c
/*
diff -urNp linux-2.6.32.27/fs/Kconfig.binfmt linux-2.6.32.27/fs/Kconfig.binfmt
--- linux-2.6.32.27/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/Kconfig.binfmt 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/Kconfig.binfmt 2010-12-31 14:46:53.000000000 -0500
@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
@@ -33715,7 +33384,7 @@ diff -urNp linux-2.6.32.27/fs/Kconfig.binfmt linux-2.6.32.27/fs/Kconfig.binfmt
executables used in the earliest versions of UNIX. Linux used
diff -urNp linux-2.6.32.27/fs/lockd/svc.c linux-2.6.32.27/fs/lockd/svc.c
--- linux-2.6.32.27/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/lockd/svc.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/lockd/svc.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@
static struct svc_program nlmsvc_program;
@@ -33727,7 +33396,7 @@ diff -urNp linux-2.6.32.27/fs/lockd/svc.c linux-2.6.32.27/fs/lockd/svc.c
static DEFINE_MUTEX(nlmsvc_mutex);
diff -urNp linux-2.6.32.27/fs/locks.c linux-2.6.32.27/fs/locks.c
--- linux-2.6.32.27/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/locks.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/locks.c 2010-12-31 14:46:53.000000000 -0500
@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
return;
@@ -33751,7 +33420,7 @@ diff -urNp linux-2.6.32.27/fs/locks.c linux-2.6.32.27/fs/locks.c
lock_kernel();
diff -urNp linux-2.6.32.27/fs/namei.c linux-2.6.32.27/fs/namei.c
--- linux-2.6.32.27/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/namei.c 2010-12-09 18:12:50.000000000 -0500
++++ linux-2.6.32.27/fs/namei.c 2010-12-31 14:46:53.000000000 -0500
@@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
return ret;
@@ -34131,7 +33800,7 @@ diff -urNp linux-2.6.32.27/fs/namei.c linux-2.6.32.27/fs/namei.c
exit5:
diff -urNp linux-2.6.32.27/fs/namespace.c linux-2.6.32.27/fs/namespace.c
--- linux-2.6.32.27/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/namespace.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/namespace.c 2010-12-31 14:46:53.000000000 -0500
@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -34194,7 +33863,7 @@ diff -urNp linux-2.6.32.27/fs/namespace.c linux-2.6.32.27/fs/namespace.c
path_get(&current->fs->root);
diff -urNp linux-2.6.32.27/fs/nfs/inode.c linux-2.6.32.27/fs/nfs/inode.c
--- linux-2.6.32.27/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/nfs/inode.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/nfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
}
@@ -34217,7 +33886,7 @@ diff -urNp linux-2.6.32.27/fs/nfs/inode.c linux-2.6.32.27/fs/nfs/inode.c
void nfs_fattr_init(struct nfs_fattr *fattr)
diff -urNp linux-2.6.32.27/fs/nfs/nfs4proc.c linux-2.6.32.27/fs/nfs/nfs4proc.c
--- linux-2.6.32.27/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/nfs/nfs4proc.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/nfs/nfs4proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
{
@@ -34490,7 +34159,7 @@ diff -urNp linux-2.6.32.27/fs/nfs/nfs4proc.c linux-2.6.32.27/fs/nfs/nfs4proc.c
err = nfs4_set_lock_state(state, fl);
diff -urNp linux-2.6.32.27/fs/nfsd/lockd.c linux-2.6.32.27/fs/nfsd/lockd.c
--- linux-2.6.32.27/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/nfsd/lockd.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/nfsd/lockd.c 2010-12-31 14:46:53.000000000 -0500
@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
@@ -34502,7 +34171,7 @@ diff -urNp linux-2.6.32.27/fs/nfsd/lockd.c linux-2.6.32.27/fs/nfsd/lockd.c
};
diff -urNp linux-2.6.32.27/fs/nfsd/vfs.c linux-2.6.32.27/fs/nfsd/vfs.c
--- linux-2.6.32.27/fs/nfsd/vfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/nfsd/vfs.c 2010-12-09 18:12:43.000000000 -0500
++++ linux-2.6.32.27/fs/nfsd/vfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
@@ -34532,7 +34201,7 @@ diff -urNp linux-2.6.32.27/fs/nfsd/vfs.c linux-2.6.32.27/fs/nfsd/vfs.c
if (host_err < 0)
diff -urNp linux-2.6.32.27/fs/nls/nls_base.c linux-2.6.32.27/fs/nls/nls_base.c
--- linux-2.6.32.27/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/nls/nls_base.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/nls/nls_base.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
{0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
{0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -34544,7 +34213,7 @@ diff -urNp linux-2.6.32.27/fs/nls/nls_base.c linux-2.6.32.27/fs/nls/nls_base.c
#define UNICODE_MAX 0x0010ffff
diff -urNp linux-2.6.32.27/fs/ntfs/dir.c linux-2.6.32.27/fs/ntfs/dir.c
--- linux-2.6.32.27/fs/ntfs/dir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ntfs/dir.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/fs/ntfs/dir.c 2010-12-31 14:46:53.000000000 -0500
@@ -1328,7 +1328,7 @@ find_next_index_buffer:
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
~(s64)(ndir->itype.index.block_size - 1)));
@@ -34556,7 +34225,7 @@ diff -urNp linux-2.6.32.27/fs/ntfs/dir.c linux-2.6.32.27/fs/ntfs/dir.c
goto err_out;
diff -urNp linux-2.6.32.27/fs/ntfs/file.c linux-2.6.32.27/fs/ntfs/file.c
--- linux-2.6.32.27/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ntfs/file.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/fs/ntfs/file.c 2010-12-31 14:46:53.000000000 -0500
@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -34568,7 +34237,7 @@ diff -urNp linux-2.6.32.27/fs/ntfs/file.c linux-2.6.32.27/fs/ntfs/file.c
+const struct inode_operations ntfs_empty_inode_ops __read_only;
diff -urNp linux-2.6.32.27/fs/ocfs2/cluster/masklog.c linux-2.6.32.27/fs/ocfs2/cluster/masklog.c
--- linux-2.6.32.27/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ocfs2/cluster/masklog.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/ocfs2/cluster/masklog.c 2010-12-31 14:46:53.000000000 -0500
@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
return mlog_mask_store(mlog_attr->mask, buf, count);
}
@@ -34580,7 +34249,7 @@ diff -urNp linux-2.6.32.27/fs/ocfs2/cluster/masklog.c linux-2.6.32.27/fs/ocfs2/c
};
diff -urNp linux-2.6.32.27/fs/ocfs2/localalloc.c linux-2.6.32.27/fs/ocfs2/localalloc.c
--- linux-2.6.32.27/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ocfs2/localalloc.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/ocfs2/localalloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -34592,7 +34261,7 @@ diff -urNp linux-2.6.32.27/fs/ocfs2/localalloc.c linux-2.6.32.27/fs/ocfs2/locala
bail:
diff -urNp linux-2.6.32.27/fs/ocfs2/ocfs2.h linux-2.6.32.27/fs/ocfs2/ocfs2.h
--- linux-2.6.32.27/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ocfs2/ocfs2.h 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/ocfs2/ocfs2.h 2010-12-31 14:46:53.000000000 -0500
@@ -217,11 +217,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -34612,7 +34281,7 @@ diff -urNp linux-2.6.32.27/fs/ocfs2/ocfs2.h linux-2.6.32.27/fs/ocfs2/ocfs2.h
enum ocfs2_local_alloc_state
diff -urNp linux-2.6.32.27/fs/ocfs2/suballoc.c linux-2.6.32.27/fs/ocfs2/suballoc.c
--- linux-2.6.32.27/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ocfs2/suballoc.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/ocfs2/suballoc.c 2010-12-31 14:46:53.000000000 -0500
@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
@@ -34660,7 +34329,7 @@ diff -urNp linux-2.6.32.27/fs/ocfs2/suballoc.c linux-2.6.32.27/fs/ocfs2/suballoc
if (status < 0) {
diff -urNp linux-2.6.32.27/fs/ocfs2/super.c linux-2.6.32.27/fs/ocfs2/super.c
--- linux-2.6.32.27/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/ocfs2/super.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/ocfs2/super.c 2010-12-31 14:46:53.000000000 -0500
@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -34697,7 +34366,7 @@ diff -urNp linux-2.6.32.27/fs/ocfs2/super.c linux-2.6.32.27/fs/ocfs2/super.c
osb->osb_ecc_stats = *stats;
diff -urNp linux-2.6.32.27/fs/open.c linux-2.6.32.27/fs/open.c
--- linux-2.6.32.27/fs/open.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/open.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/open.c 2010-12-31 14:46:53.000000000 -0500
@@ -275,6 +275,10 @@ static long do_sys_truncate(const char _
error = locks_verify_truncate(inode, NULL, length);
if (!error)
@@ -34872,7 +34541,7 @@ diff -urNp linux-2.6.32.27/fs/open.c linux-2.6.32.27/fs/open.c
fput(file);
diff -urNp linux-2.6.32.27/fs/pipe.c linux-2.6.32.27/fs/pipe.c
--- linux-2.6.32.27/fs/pipe.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/fs/pipe.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/pipe.c 2010-12-31 14:46:53.000000000 -0500
@@ -363,7 +363,7 @@ pipe_read(struct kiocb *iocb, const stru
error = ops->confirm(pipe, buf);
if (error) {
@@ -35007,7 +34676,7 @@ diff -urNp linux-2.6.32.27/fs/pipe.c linux-2.6.32.27/fs/pipe.c
/*
diff -urNp linux-2.6.32.27/fs/proc/array.c linux-2.6.32.27/fs/proc/array.c
--- linux-2.6.32.27/fs/proc/array.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/array.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/array.c 2010-12-31 14:46:53.000000000 -0500
@@ -60,6 +60,7 @@
#include <linux/tty.h>
#include <linux/string.h>
@@ -35112,7 +34781,7 @@ diff -urNp linux-2.6.32.27/fs/proc/array.c linux-2.6.32.27/fs/proc/array.c
+#endif
diff -urNp linux-2.6.32.27/fs/proc/base.c linux-2.6.32.27/fs/proc/base.c
--- linux-2.6.32.27/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/base.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/base.c 2010-12-31 14:46:53.000000000 -0500
@@ -102,6 +102,22 @@ struct pid_entry {
union proc_op op;
};
@@ -35489,7 +35158,7 @@ diff -urNp linux-2.6.32.27/fs/proc/base.c linux-2.6.32.27/fs/proc/base.c
#ifdef CONFIG_SCHEDSTATS
diff -urNp linux-2.6.32.27/fs/proc/cmdline.c linux-2.6.32.27/fs/proc/cmdline.c
--- linux-2.6.32.27/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/cmdline.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/cmdline.c 2010-12-31 14:46:53.000000000 -0500
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -35504,7 +35173,7 @@ diff -urNp linux-2.6.32.27/fs/proc/cmdline.c linux-2.6.32.27/fs/proc/cmdline.c
module_init(proc_cmdline_init);
diff -urNp linux-2.6.32.27/fs/proc/devices.c linux-2.6.32.27/fs/proc/devices.c
--- linux-2.6.32.27/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/devices.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/devices.c 2010-12-31 14:46:53.000000000 -0500
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -35519,7 +35188,7 @@ diff -urNp linux-2.6.32.27/fs/proc/devices.c linux-2.6.32.27/fs/proc/devices.c
module_init(proc_devices_init);
diff -urNp linux-2.6.32.27/fs/proc/inode.c linux-2.6.32.27/fs/proc/inode.c
--- linux-2.6.32.27/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/inode.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
@@ -35534,7 +35203,7 @@ diff -urNp linux-2.6.32.27/fs/proc/inode.c linux-2.6.32.27/fs/proc/inode.c
inode->i_size = de->size;
diff -urNp linux-2.6.32.27/fs/proc/internal.h linux-2.6.32.27/fs/proc/internal.h
--- linux-2.6.32.27/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/internal.h 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/internal.h 2010-12-31 14:46:53.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,
@@ -35547,7 +35216,7 @@ diff -urNp linux-2.6.32.27/fs/proc/internal.h linux-2.6.32.27/fs/proc/internal.h
extern const struct file_operations proc_maps_operations;
diff -urNp linux-2.6.32.27/fs/proc/Kconfig linux-2.6.32.27/fs/proc/Kconfig
--- linux-2.6.32.27/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/Kconfig 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
@@ -35577,7 +35246,7 @@ diff -urNp linux-2.6.32.27/fs/proc/Kconfig linux-2.6.32.27/fs/proc/Kconfig
Various /proc files exist to monitor process memory utilization:
diff -urNp linux-2.6.32.27/fs/proc/kcore.c linux-2.6.32.27/fs/proc/kcore.c
--- linux-2.6.32.27/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/kcore.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/kcore.c 2010-12-31 14:47:01.000000000 -0500
@@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use
* the addresses in the elf_phdr on our list.
*/
@@ -35591,12 +35260,13 @@ diff -urNp linux-2.6.32.27/fs/proc/kcore.c linux-2.6.32.27/fs/proc/kcore.c
while (buflen) {
struct kcore_list *m;
-@@ -508,20 +509,18 @@ read_kcore(struct file *file, char __use
+@@ -508,20 +509,23 @@ read_kcore(struct file *file, char __use
kfree(elf_buf);
} else {
if (kern_addr_valid(start)) {
- unsigned long n;
+ char *elf_buf;
++ mm_segment_t oldfs;
- n = copy_to_user(buffer, (char *)start, tsz);
- /*
@@ -35611,17 +35281,21 @@ diff -urNp linux-2.6.32.27/fs/proc/kcore.c linux-2.6.32.27/fs/proc/kcore.c
+ elf_buf = kmalloc(tsz, GFP_KERNEL);
+ if (!elf_buf)
+ return -ENOMEM;
++ oldfs = get_fs();
++ set_fs(KERNEL_DS);
+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
++ set_fs(oldfs);
+ if (copy_to_user(buffer, elf_buf, tsz)) {
+ kfree(elf_buf);
return -EFAULT;
+ }
}
++ set_fs(oldfs);
+ kfree(elf_buf);
} else {
if (clear_user(buffer, tsz))
return -EFAULT;
-@@ -541,6 +540,9 @@ read_kcore(struct file *file, char __use
+@@ -541,6 +545,9 @@ read_kcore(struct file *file, char __use
static int open_kcore(struct inode *inode, struct file *filp)
{
@@ -35633,7 +35307,7 @@ diff -urNp linux-2.6.32.27/fs/proc/kcore.c linux-2.6.32.27/fs/proc/kcore.c
if (kcore_need_update)
diff -urNp linux-2.6.32.27/fs/proc/meminfo.c linux-2.6.32.27/fs/proc/meminfo.c
--- linux-2.6.32.27/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/meminfo.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/meminfo.c 2010-12-31 14:46:53.000000000 -0500
@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
vmi.used >> 10,
vmi.largest_chunk >> 10
@@ -35645,7 +35319,7 @@ diff -urNp linux-2.6.32.27/fs/proc/meminfo.c linux-2.6.32.27/fs/proc/meminfo.c
diff -urNp linux-2.6.32.27/fs/proc/nommu.c linux-2.6.32.27/fs/proc/nommu.c
--- linux-2.6.32.27/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/nommu.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/nommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -35657,7 +35331,7 @@ diff -urNp linux-2.6.32.27/fs/proc/nommu.c linux-2.6.32.27/fs/proc/nommu.c
seq_putc(m, '\n');
diff -urNp linux-2.6.32.27/fs/proc/proc_net.c linux-2.6.32.27/fs/proc/proc_net.c
--- linux-2.6.32.27/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/proc_net.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/proc_net.c 2010-12-31 14:46:53.000000000 -0500
@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -35678,7 +35352,7 @@ diff -urNp linux-2.6.32.27/fs/proc/proc_net.c linux-2.6.32.27/fs/proc/proc_net.c
task = pid_task(proc_pid(dir), PIDTYPE_PID);
diff -urNp linux-2.6.32.27/fs/proc/proc_sysctl.c linux-2.6.32.27/fs/proc/proc_sysctl.c
--- linux-2.6.32.27/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/proc_sysctl.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/proc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -7,6 +7,8 @@
#include <linux/security.h>
#include "internal.h"
@@ -35720,7 +35394,7 @@ diff -urNp linux-2.6.32.27/fs/proc/proc_sysctl.c linux-2.6.32.27/fs/proc/proc_sy
stat->mode = (stat->mode & S_IFMT) | table->mode;
diff -urNp linux-2.6.32.27/fs/proc/root.c linux-2.6.32.27/fs/proc/root.c
--- linux-2.6.32.27/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/root.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/root.c 2010-12-31 14:46:53.000000000 -0500
@@ -134,7 +134,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -35739,7 +35413,7 @@ diff -urNp linux-2.6.32.27/fs/proc/root.c linux-2.6.32.27/fs/proc/root.c
diff -urNp linux-2.6.32.27/fs/proc/task_mmu.c linux-2.6.32.27/fs/proc/task_mmu.c
--- linux-2.6.32.27/fs/proc/task_mmu.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/task_mmu.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/task_mmu.c 2010-12-31 14:46:53.000000000 -0500
@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
"VmStk:\t%8lu kB\n"
"VmExe:\t%8lu kB\n"
@@ -35878,7 +35552,7 @@ diff -urNp linux-2.6.32.27/fs/proc/task_mmu.c linux-2.6.32.27/fs/proc/task_mmu.c
mss.shared_clean >> 10,
diff -urNp linux-2.6.32.27/fs/proc/task_nommu.c linux-2.6.32.27/fs/proc/task_nommu.c
--- linux-2.6.32.27/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/proc/task_nommu.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/proc/task_nommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -35899,7 +35573,7 @@ diff -urNp linux-2.6.32.27/fs/proc/task_nommu.c linux-2.6.32.27/fs/proc/task_nom
seq_putc(m, '\n');
diff -urNp linux-2.6.32.27/fs/readdir.c linux-2.6.32.27/fs/readdir.c
--- linux-2.6.32.27/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/readdir.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/readdir.c 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -35991,7 +35665,7 @@ diff -urNp linux-2.6.32.27/fs/readdir.c linux-2.6.32.27/fs/readdir.c
diff -urNp linux-2.6.32.27/fs/reiserfs/do_balan.c linux-2.6.32.27/fs/reiserfs/do_balan.c
--- linux-2.6.32.27/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/reiserfs/do_balan.c 2010-12-09 18:12:46.000000000 -0500
++++ linux-2.6.32.27/fs/reiserfs/do_balan.c 2010-12-31 14:46:53.000000000 -0500
@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -36003,7 +35677,7 @@ diff -urNp linux-2.6.32.27/fs/reiserfs/do_balan.c linux-2.6.32.27/fs/reiserfs/do
/* balance leaf returns 0 except if combining L R and S into
diff -urNp linux-2.6.32.27/fs/reiserfs/item_ops.c linux-2.6.32.27/fs/reiserfs/item_ops.c
--- linux-2.6.32.27/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/reiserfs/item_ops.c 2010-12-09 18:12:46.000000000 -0500
++++ linux-2.6.32.27/fs/reiserfs/item_ops.c 2010-12-31 14:46:53.000000000 -0500
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
vi->vi_index, vi->vi_type, vi->vi_ih);
}
@@ -36060,7 +35734,7 @@ diff -urNp linux-2.6.32.27/fs/reiserfs/item_ops.c linux-2.6.32.27/fs/reiserfs/it
&direct_ops,
diff -urNp linux-2.6.32.27/fs/reiserfs/procfs.c linux-2.6.32.27/fs/reiserfs/procfs.c
--- linux-2.6.32.27/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/reiserfs/procfs.c 2010-12-09 18:12:46.000000000 -0500
++++ linux-2.6.32.27/fs/reiserfs/procfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -36072,7 +35746,7 @@ diff -urNp linux-2.6.32.27/fs/reiserfs/procfs.c linux-2.6.32.27/fs/reiserfs/proc
SF(s_good_search_by_key_reada), SF(s_bmaps),
diff -urNp linux-2.6.32.27/fs/select.c linux-2.6.32.27/fs/select.c
--- linux-2.6.32.27/fs/select.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/select.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/select.c 2010-12-31 14:46:53.000000000 -0500
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -36091,7 +35765,7 @@ diff -urNp linux-2.6.32.27/fs/select.c linux-2.6.32.27/fs/select.c
diff -urNp linux-2.6.32.27/fs/seq_file.c linux-2.6.32.27/fs/seq_file.c
--- linux-2.6.32.27/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/seq_file.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/seq_file.c 2010-12-31 14:46:53.000000000 -0500
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -36134,7 +35808,7 @@ diff -urNp linux-2.6.32.27/fs/seq_file.c linux-2.6.32.27/fs/seq_file.c
m->count = 0;
diff -urNp linux-2.6.32.27/fs/smbfs/symlink.c linux-2.6.32.27/fs/smbfs/symlink.c
--- linux-2.6.32.27/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/smbfs/symlink.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/smbfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -36146,7 +35820,7 @@ diff -urNp linux-2.6.32.27/fs/smbfs/symlink.c linux-2.6.32.27/fs/smbfs/symlink.c
}
diff -urNp linux-2.6.32.27/fs/splice.c linux-2.6.32.27/fs/splice.c
--- linux-2.6.32.27/fs/splice.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/splice.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/splice.c 2010-12-31 14:46:53.000000000 -0500
@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
@@ -36287,7 +35961,7 @@ diff -urNp linux-2.6.32.27/fs/splice.c linux-2.6.32.27/fs/splice.c
pipe_unlock(ipipe);
diff -urNp linux-2.6.32.27/fs/sysfs/file.c linux-2.6.32.27/fs/sysfs/file.c
--- linux-2.6.32.27/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/fs/sysfs/file.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/sysfs/file.c 2010-12-31 14:46:53.000000000 -0500
@@ -53,7 +53,7 @@ struct sysfs_buffer {
size_t count;
loff_t pos;
@@ -36326,7 +36000,7 @@ diff -urNp linux-2.6.32.27/fs/sysfs/file.c linux-2.6.32.27/fs/sysfs/file.c
diff -urNp linux-2.6.32.27/fs/sysfs/symlink.c linux-2.6.32.27/fs/sysfs/symlink.c
--- linux-2.6.32.27/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/sysfs/symlink.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/sysfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -36338,7 +36012,7 @@ diff -urNp linux-2.6.32.27/fs/sysfs/symlink.c linux-2.6.32.27/fs/sysfs/symlink.c
}
diff -urNp linux-2.6.32.27/fs/udf/balloc.c linux-2.6.32.27/fs/udf/balloc.c
--- linux-2.6.32.27/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/udf/balloc.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/udf/balloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
mutex_lock(&sbi->s_alloc_mutex);
@@ -36363,7 +36037,7 @@ diff -urNp linux-2.6.32.27/fs/udf/balloc.c linux-2.6.32.27/fs/udf/balloc.c
partmap->s_partition_len);
diff -urNp linux-2.6.32.27/fs/udf/misc.c linux-2.6.32.27/fs/udf/misc.c
--- linux-2.6.32.27/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/udf/misc.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/udf/misc.c 2010-12-31 14:46:53.000000000 -0500
@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
iinfo->i_lenEAttr += size;
return (struct genericFormat *)&ea[offset];
@@ -36386,7 +36060,7 @@ diff -urNp linux-2.6.32.27/fs/udf/misc.c linux-2.6.32.27/fs/udf/misc.c
for (i = 0; i < sizeof(struct tag); ++i)
diff -urNp linux-2.6.32.27/fs/udf/udfdecl.h linux-2.6.32.27/fs/udf/udfdecl.h
--- linux-2.6.32.27/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/udf/udfdecl.h 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/udf/udfdecl.h 2010-12-31 14:46:53.000000000 -0500
@@ -26,7 +26,7 @@ do { \
printk(f, ##a); \
} while (0)
@@ -36398,7 +36072,7 @@ diff -urNp linux-2.6.32.27/fs/udf/udfdecl.h linux-2.6.32.27/fs/udf/udfdecl.h
#define udf_info(f, a...) \
diff -urNp linux-2.6.32.27/fs/utimes.c linux-2.6.32.27/fs/utimes.c
--- linux-2.6.32.27/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/utimes.c 2010-12-09 18:12:44.000000000 -0500
++++ linux-2.6.32.27/fs/utimes.c 2010-12-31 14:46:53.000000000 -0500
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -36422,7 +36096,7 @@ diff -urNp linux-2.6.32.27/fs/utimes.c linux-2.6.32.27/fs/utimes.c
mutex_unlock(&inode->i_mutex);
diff -urNp linux-2.6.32.27/fs/xattr_acl.c linux-2.6.32.27/fs/xattr_acl.c
--- linux-2.6.32.27/fs/xattr_acl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/xattr_acl.c 2010-12-09 18:12:51.000000000 -0500
++++ linux-2.6.32.27/fs/xattr_acl.c 2010-12-31 14:46:53.000000000 -0500
@@ -17,8 +17,8 @@
struct posix_acl *
posix_acl_from_xattr(const void *value, size_t size)
@@ -36436,7 +36110,7 @@ diff -urNp linux-2.6.32.27/fs/xattr_acl.c linux-2.6.32.27/fs/xattr_acl.c
struct posix_acl_entry *acl_e;
diff -urNp linux-2.6.32.27/fs/xattr.c linux-2.6.32.27/fs/xattr.c
--- linux-2.6.32.27/fs/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/xattr.c 2010-12-09 18:12:45.000000000 -0500
++++ linux-2.6.32.27/fs/xattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
@@ -36501,7 +36175,7 @@ diff -urNp linux-2.6.32.27/fs/xattr.c linux-2.6.32.27/fs/xattr.c
fput(f);
diff -urNp linux-2.6.32.27/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.27/fs/xfs/linux-2.6/xfs_ioctl.c
--- linux-2.6.32.27/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/fs/xfs/linux-2.6/xfs_ioctl.c 2010-12-09 18:12:48.000000000 -0500
++++ linux-2.6.32.27/fs/xfs/linux-2.6/xfs_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -134,7 +134,7 @@ xfs_find_handle(
}
@@ -36522,7 +36196,7 @@ diff -urNp linux-2.6.32.27/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.27/fs/xfs/l
diff -urNp linux-2.6.32.27/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.27/fs/xfs/linux-2.6/xfs_iops.c
--- linux-2.6.32.27/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/xfs/linux-2.6/xfs_iops.c 2010-12-09 18:12:48.000000000 -0500
++++ linux-2.6.32.27/fs/xfs/linux-2.6/xfs_iops.c 2010-12-31 14:46:53.000000000 -0500
@@ -468,7 +468,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -36534,7 +36208,7 @@ diff -urNp linux-2.6.32.27/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.27/fs/xfs/li
kfree(s);
diff -urNp linux-2.6.32.27/fs/xfs/xfs_bmap.c linux-2.6.32.27/fs/xfs/xfs_bmap.c
--- linux-2.6.32.27/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/fs/xfs/xfs_bmap.c 2010-12-09 18:12:47.000000000 -0500
++++ linux-2.6.32.27/fs/xfs/xfs_bmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -36546,7 +36220,7 @@ diff -urNp linux-2.6.32.27/fs/xfs/xfs_bmap.c linux-2.6.32.27/fs/xfs/xfs_bmap.c
#if defined(XFS_RW_TRACE)
diff -urNp linux-2.6.32.27/grsecurity/gracl_alloc.c linux-2.6.32.27/grsecurity/gracl_alloc.c
--- linux-2.6.32.27/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl_alloc.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl_alloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -36655,7 +36329,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl_alloc.c linux-2.6.32.27/grsecurity/g
+}
diff -urNp linux-2.6.32.27/grsecurity/gracl.c linux-2.6.32.27/grsecurity/gracl.c
--- linux-2.6.32.27/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl.c 2010-12-18 19:42:51.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl.c 2010-12-31 14:49:14.000000000 -0500
@@ -0,0 +1,3973 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -38422,7 +38096,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl.c linux-2.6.32.27/grsecurity/gracl.c
+ int newglob = checkglob;
+
+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
-+ as we don't want a /* rule to match instead of the / object
++ as we don't want a / * rule to match instead of the / object
+ don't do this for create lookups that call this function though, since they're looking up
+ on the parent and thus need globbing checks on all paths
+ */
@@ -40632,7 +40306,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl.c linux-2.6.32.27/grsecurity/gracl.c
+
diff -urNp linux-2.6.32.27/grsecurity/gracl_cap.c linux-2.6.32.27/grsecurity/gracl_cap.c
--- linux-2.6.32.27/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl_cap.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl_cap.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,138 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -40774,7 +40448,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl_cap.c linux-2.6.32.27/grsecurity/gra
+
diff -urNp linux-2.6.32.27/grsecurity/gracl_fs.c linux-2.6.32.27/grsecurity/gracl_fs.c
--- linux-2.6.32.27/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl_fs.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl_fs.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,430 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41208,7 +40882,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl_fs.c linux-2.6.32.27/grsecurity/grac
+}
diff -urNp linux-2.6.32.27/grsecurity/gracl_ip.c linux-2.6.32.27/grsecurity/gracl_ip.c
--- linux-2.6.32.27/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl_ip.c 2010-12-12 17:18:42.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl_ip.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,382 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -41594,7 +41268,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl_ip.c linux-2.6.32.27/grsecurity/grac
+}
diff -urNp linux-2.6.32.27/grsecurity/gracl_learn.c linux-2.6.32.27/grsecurity/gracl_learn.c
--- linux-2.6.32.27/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl_learn.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl_learn.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,211 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -41809,7 +41483,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl_learn.c linux-2.6.32.27/grsecurity/g
+};
diff -urNp linux-2.6.32.27/grsecurity/gracl_res.c linux-2.6.32.27/grsecurity/gracl_res.c
--- linux-2.6.32.27/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl_res.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl_res.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,67 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41880,7 +41554,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl_res.c linux-2.6.32.27/grsecurity/gra
+}
diff -urNp linux-2.6.32.27/grsecurity/gracl_segv.c linux-2.6.32.27/grsecurity/gracl_segv.c
--- linux-2.6.32.27/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl_segv.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl_segv.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -42194,7 +41868,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl_segv.c linux-2.6.32.27/grsecurity/gr
+}
diff -urNp linux-2.6.32.27/grsecurity/gracl_shm.c linux-2.6.32.27/grsecurity/gracl_shm.c
--- linux-2.6.32.27/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/gracl_shm.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/gracl_shm.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -42238,7 +41912,7 @@ diff -urNp linux-2.6.32.27/grsecurity/gracl_shm.c linux-2.6.32.27/grsecurity/gra
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_chdir.c linux-2.6.32.27/grsecurity/grsec_chdir.c
--- linux-2.6.32.27/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_chdir.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_chdir.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42261,7 +41935,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_chdir.c linux-2.6.32.27/grsecurity/g
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_chroot.c linux-2.6.32.27/grsecurity/grsec_chroot.c
--- linux-2.6.32.27/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_chroot.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_chroot.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,389 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -42654,7 +42328,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_chroot.c linux-2.6.32.27/grsecurity/
+#endif
diff -urNp linux-2.6.32.27/grsecurity/grsec_disabled.c linux-2.6.32.27/grsecurity/grsec_disabled.c
--- linux-2.6.32.27/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_disabled.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_disabled.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,442 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -43100,7 +42774,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_disabled.c linux-2.6.32.27/grsecurit
+#endif
diff -urNp linux-2.6.32.27/grsecurity/grsec_exec.c linux-2.6.32.27/grsecurity/grsec_exec.c
--- linux-2.6.32.27/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_exec.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_exec.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,89 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43193,7 +42867,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_exec.c linux-2.6.32.27/grsecurity/gr
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_fifo.c linux-2.6.32.27/grsecurity/grsec_fifo.c
--- linux-2.6.32.27/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_fifo.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_fifo.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43221,7 +42895,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_fifo.c linux-2.6.32.27/grsecurity/gr
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_fork.c linux-2.6.32.27/grsecurity/grsec_fork.c
--- linux-2.6.32.27/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_fork.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_fork.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43248,7 +42922,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_fork.c linux-2.6.32.27/grsecurity/gr
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_init.c linux-2.6.32.27/grsecurity/grsec_init.c
--- linux-2.6.32.27/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_init.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_init.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,270 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43522,7 +43196,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_init.c linux-2.6.32.27/grsecurity/gr
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_link.c linux-2.6.32.27/grsecurity/grsec_link.c
--- linux-2.6.32.27/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_link.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_link.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43569,7 +43243,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_link.c linux-2.6.32.27/grsecurity/gr
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_log.c linux-2.6.32.27/grsecurity/grsec_log.c
--- linux-2.6.32.27/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_log.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_log.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43883,7 +43557,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_log.c linux-2.6.32.27/grsecurity/grs
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_mem.c linux-2.6.32.27/grsecurity/grsec_mem.c
--- linux-2.6.32.27/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_mem.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_mem.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,85 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43972,7 +43646,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_mem.c linux-2.6.32.27/grsecurity/grs
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_mount.c linux-2.6.32.27/grsecurity/grsec_mount.c
--- linux-2.6.32.27/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_mount.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_mount.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44038,7 +43712,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_mount.c linux-2.6.32.27/grsecurity/g
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_pax.c linux-2.6.32.27/grsecurity/grsec_pax.c
--- linux-2.6.32.27/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_pax.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_pax.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44078,7 +43752,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_pax.c linux-2.6.32.27/grsecurity/grs
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_ptrace.c linux-2.6.32.27/grsecurity/grsec_ptrace.c
--- linux-2.6.32.27/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_ptrace.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_ptrace.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44096,7 +43770,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_ptrace.c linux-2.6.32.27/grsecurity/
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_sig.c linux-2.6.32.27/grsecurity/grsec_sig.c
--- linux-2.6.32.27/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_sig.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_sig.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44165,7 +43839,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_sig.c linux-2.6.32.27/grsecurity/grs
+
diff -urNp linux-2.6.32.27/grsecurity/grsec_sock.c linux-2.6.32.27/grsecurity/grsec_sock.c
--- linux-2.6.32.27/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_sock.c 2010-12-14 23:53:23.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_sock.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,275 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -44444,7 +44118,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_sock.c linux-2.6.32.27/grsecurity/gr
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_sysctl.c linux-2.6.32.27/grsecurity/grsec_sysctl.c
--- linux-2.6.32.27/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_sysctl.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,479 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44927,7 +44601,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_sysctl.c linux-2.6.32.27/grsecurity/
+#endif
diff -urNp linux-2.6.32.27/grsecurity/grsec_time.c linux-2.6.32.27/grsecurity/grsec_time.c
--- linux-2.6.32.27/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_time.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_time.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,13 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44944,7 +44618,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_time.c linux-2.6.32.27/grsecurity/gr
+}
diff -urNp linux-2.6.32.27/grsecurity/grsec_tpe.c linux-2.6.32.27/grsecurity/grsec_tpe.c
--- linux-2.6.32.27/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsec_tpe.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsec_tpe.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44987,7 +44661,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsec_tpe.c linux-2.6.32.27/grsecurity/grs
+}
diff -urNp linux-2.6.32.27/grsecurity/grsum.c linux-2.6.32.27/grsecurity/grsum.c
--- linux-2.6.32.27/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/grsum.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/grsum.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -45052,7 +44726,7 @@ diff -urNp linux-2.6.32.27/grsecurity/grsum.c linux-2.6.32.27/grsecurity/grsum.c
+}
diff -urNp linux-2.6.32.27/grsecurity/Kconfig linux-2.6.32.27/grsecurity/Kconfig
--- linux-2.6.32.27/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/Kconfig 2010-12-09 19:18:01.000000000 -0500
++++ linux-2.6.32.27/grsecurity/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,1000 @@
+#
+# grecurity configuration
@@ -46056,7 +45730,7 @@ diff -urNp linux-2.6.32.27/grsecurity/Kconfig linux-2.6.32.27/grsecurity/Kconfig
+endmenu
diff -urNp linux-2.6.32.27/grsecurity/Makefile linux-2.6.32.27/grsecurity/Makefile
--- linux-2.6.32.27/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/grsecurity/Makefile 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/grsecurity/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,29 @@
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -46089,7 +45763,7 @@ diff -urNp linux-2.6.32.27/grsecurity/Makefile linux-2.6.32.27/grsecurity/Makefi
+endif
diff -urNp linux-2.6.32.27/include/acpi/acoutput.h linux-2.6.32.27/include/acpi/acoutput.h
--- linux-2.6.32.27/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/acpi/acoutput.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/acpi/acoutput.h 2010-12-31 14:46:53.000000000 -0500
@@ -264,8 +264,8 @@
* leaving no executable debug code!
*/
@@ -46103,7 +45777,7 @@ diff -urNp linux-2.6.32.27/include/acpi/acoutput.h linux-2.6.32.27/include/acpi/
diff -urNp linux-2.6.32.27/include/acpi/acpi_drivers.h linux-2.6.32.27/include/acpi/acpi_drivers.h
--- linux-2.6.32.27/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/acpi/acpi_drivers.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/acpi/acpi_drivers.h 2010-12-31 14:46:53.000000000 -0500
@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
Dock Station
-------------------------------------------------------------------------- */
@@ -46135,7 +45809,7 @@ diff -urNp linux-2.6.32.27/include/acpi/acpi_drivers.h linux-2.6.32.27/include/a
return -ENODEV;
diff -urNp linux-2.6.32.27/include/asm-generic/atomic-long.h linux-2.6.32.27/include/asm-generic/atomic-long.h
--- linux-2.6.32.27/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/atomic-long.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/atomic-long.h 2010-12-31 14:46:53.000000000 -0500
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
@@ -46394,7 +46068,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/atomic-long.h linux-2.6.32.27/inc
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
diff -urNp linux-2.6.32.27/include/asm-generic/dma-mapping-common.h linux-2.6.32.27/include/asm-generic/dma-mapping-common.h
--- linux-2.6.32.27/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/dma-mapping-common.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/dma-mapping-common.h 2010-12-31 14:46:53.000000000 -0500
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
@@ -46505,7 +46179,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/dma-mapping-common.h linux-2.6.32
if (ops->sync_sg_for_device)
diff -urNp linux-2.6.32.27/include/asm-generic/futex.h linux-2.6.32.27/include/asm-generic/futex.h
--- linux-2.6.32.27/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/futex.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/futex.h 2010-12-31 14:46:53.000000000 -0500
@@ -6,7 +6,7 @@
#include <asm/errno.h>
@@ -46526,7 +46200,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/futex.h linux-2.6.32.27/include/a
}
diff -urNp linux-2.6.32.27/include/asm-generic/int-l64.h linux-2.6.32.27/include/asm-generic/int-l64.h
--- linux-2.6.32.27/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/int-l64.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/int-l64.h 2010-12-31 14:46:53.000000000 -0500
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -46538,7 +46212,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/int-l64.h linux-2.6.32.27/include
#define S16_C(x) x
diff -urNp linux-2.6.32.27/include/asm-generic/int-ll64.h linux-2.6.32.27/include/asm-generic/int-ll64.h
--- linux-2.6.32.27/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/int-ll64.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/int-ll64.h 2010-12-31 14:46:53.000000000 -0500
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -46550,7 +46224,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/int-ll64.h linux-2.6.32.27/includ
#define S16_C(x) x
diff -urNp linux-2.6.32.27/include/asm-generic/kmap_types.h linux-2.6.32.27/include/asm-generic/kmap_types.h
--- linux-2.6.32.27/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/kmap_types.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
@@ -46563,7 +46237,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/kmap_types.h linux-2.6.32.27/incl
#undef KMAP_D
diff -urNp linux-2.6.32.27/include/asm-generic/pgtable.h linux-2.6.32.27/include/asm-generic/pgtable.h
--- linux-2.6.32.27/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/pgtable.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
unsigned long size);
#endif
@@ -46581,7 +46255,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/pgtable.h linux-2.6.32.27/include
#endif /* _ASM_GENERIC_PGTABLE_H */
diff -urNp linux-2.6.32.27/include/asm-generic/pgtable-nopmd.h linux-2.6.32.27/include/asm-generic/pgtable-nopmd.h
--- linux-2.6.32.27/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/pgtable-nopmd.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/pgtable-nopmd.h 2010-12-31 14:46:53.000000000 -0500
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
@@ -46620,7 +46294,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/pgtable-nopmd.h linux-2.6.32.27/i
* setup: the pmd is never bad, and a pmd always exists (as it's folded
diff -urNp linux-2.6.32.27/include/asm-generic/pgtable-nopud.h linux-2.6.32.27/include/asm-generic/pgtable-nopud.h
--- linux-2.6.32.27/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/pgtable-nopud.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/pgtable-nopud.h 2010-12-31 14:46:53.000000000 -0500
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
@@ -46653,7 +46327,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/pgtable-nopud.h linux-2.6.32.27/i
* setup: the pud is never bad, and a pud always exists (as it's folded
diff -urNp linux-2.6.32.27/include/asm-generic/vmlinux.lds.h linux-2.6.32.27/include/asm-generic/vmlinux.lds.h
--- linux-2.6.32.27/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/asm-generic/vmlinux.lds.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/asm-generic/vmlinux.lds.h 2010-12-31 14:46:53.000000000 -0500
@@ -199,6 +199,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -46694,7 +46368,7 @@ diff -urNp linux-2.6.32.27/include/asm-generic/vmlinux.lds.h linux-2.6.32.27/inc
* PERCPU - define output section for percpu area, simple version
diff -urNp linux-2.6.32.27/include/drm/drm_pciids.h linux-2.6.32.27/include/drm/drm_pciids.h
--- linux-2.6.32.27/include/drm/drm_pciids.h 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/include/drm/drm_pciids.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/drm/drm_pciids.h 2010-12-31 14:46:53.000000000 -0500
@@ -377,7 +377,7 @@
{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -46800,7 +46474,7 @@ diff -urNp linux-2.6.32.27/include/drm/drm_pciids.h linux-2.6.32.27/include/drm/
+ {0, 0, 0, 0, 0, 0}
diff -urNp linux-2.6.32.27/include/drm/drmP.h linux-2.6.32.27/include/drm/drmP.h
--- linux-2.6.32.27/include/drm/drmP.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/drm/drmP.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/drm/drmP.h 2010-12-31 14:46:53.000000000 -0500
@@ -814,7 +814,7 @@ struct drm_driver {
void (*vgaarb_irq)(struct drm_device *dev, bool state);
@@ -46830,7 +46504,7 @@ diff -urNp linux-2.6.32.27/include/drm/drmP.h linux-2.6.32.27/include/drm/drmP.h
struct list_head filelist;
diff -urNp linux-2.6.32.27/include/linux/a.out.h linux-2.6.32.27/include/linux/a.out.h
--- linux-2.6.32.27/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/a.out.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/a.out.h 2010-12-31 14:46:53.000000000 -0500
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -46848,7 +46522,7 @@ diff -urNp linux-2.6.32.27/include/linux/a.out.h linux-2.6.32.27/include/linux/a
#endif
diff -urNp linux-2.6.32.27/include/linux/atmdev.h linux-2.6.32.27/include/linux/atmdev.h
--- linux-2.6.32.27/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/atmdev.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/atmdev.h 2010-12-31 14:46:53.000000000 -0500
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -46860,7 +46534,7 @@ diff -urNp linux-2.6.32.27/include/linux/atmdev.h linux-2.6.32.27/include/linux/
};
diff -urNp linux-2.6.32.27/include/linux/backlight.h linux-2.6.32.27/include/linux/backlight.h
--- linux-2.6.32.27/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/backlight.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/backlight.h 2010-12-31 14:46:53.000000000 -0500
@@ -36,18 +36,18 @@ struct backlight_device;
struct fb_info;
@@ -46904,7 +46578,7 @@ diff -urNp linux-2.6.32.27/include/linux/backlight.h linux-2.6.32.27/include/lin
enum backlight_update_reason reason);
diff -urNp linux-2.6.32.27/include/linux/binfmts.h linux-2.6.32.27/include/linux/binfmts.h
--- linux-2.6.32.27/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/binfmts.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/binfmts.h 2010-12-31 14:46:53.000000000 -0500
@@ -29,6 +29,7 @@ struct linux_binprm{
char buf[BINPRM_BUF_SIZE];
#ifdef CONFIG_MMU
@@ -46934,7 +46608,7 @@ diff -urNp linux-2.6.32.27/include/linux/binfmts.h linux-2.6.32.27/include/linux
};
diff -urNp linux-2.6.32.27/include/linux/blkdev.h linux-2.6.32.27/include/linux/blkdev.h
--- linux-2.6.32.27/include/linux/blkdev.h 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/include/linux/blkdev.h 2010-12-09 18:30:40.000000000 -0500
++++ linux-2.6.32.27/include/linux/blkdev.h 2010-12-31 14:46:53.000000000 -0500
@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
#endif /* CONFIG_BLK_DEV_INTEGRITY */
@@ -46968,7 +46642,7 @@ diff -urNp linux-2.6.32.27/include/linux/blkdev.h linux-2.6.32.27/include/linux/
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
diff -urNp linux-2.6.32.27/include/linux/byteorder/little_endian.h linux-2.6.32.27/include/linux/byteorder/little_endian.h
--- linux-2.6.32.27/include/linux/byteorder/little_endian.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/byteorder/little_endian.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/byteorder/little_endian.h 2010-12-31 14:46:53.000000000 -0500
@@ -42,51 +42,51 @@
static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -47035,7 +46709,7 @@ diff -urNp linux-2.6.32.27/include/linux/byteorder/little_endian.h linux-2.6.32.
#define __le64_to_cpus(x) do { (void)(x); } while (0)
diff -urNp linux-2.6.32.27/include/linux/cache.h linux-2.6.32.27/include/linux/cache.h
--- linux-2.6.32.27/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/cache.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/cache.h 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -47049,7 +46723,7 @@ diff -urNp linux-2.6.32.27/include/linux/cache.h linux-2.6.32.27/include/linux/c
#endif
diff -urNp linux-2.6.32.27/include/linux/capability.h linux-2.6.32.27/include/linux/capability.h
--- linux-2.6.32.27/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/capability.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/capability.h 2010-12-31 14:46:53.000000000 -0500
@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
@@ -47060,7 +46734,7 @@ diff -urNp linux-2.6.32.27/include/linux/capability.h linux-2.6.32.27/include/li
struct dentry;
diff -urNp linux-2.6.32.27/include/linux/compiler-gcc4.h linux-2.6.32.27/include/linux/compiler-gcc4.h
--- linux-2.6.32.27/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/compiler-gcc4.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/compiler-gcc4.h 2010-12-31 14:46:53.000000000 -0500
@@ -36,4 +36,8 @@
the kernel context */
#define __cold __attribute__((__cold__))
@@ -47072,7 +46746,7 @@ diff -urNp linux-2.6.32.27/include/linux/compiler-gcc4.h linux-2.6.32.27/include
#endif
diff -urNp linux-2.6.32.27/include/linux/compiler.h linux-2.6.32.27/include/linux/compiler.h
--- linux-2.6.32.27/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/compiler.h 2010-12-12 11:50:10.000000000 -0500
++++ linux-2.6.32.27/include/linux/compiler.h 2010-12-31 14:57:30.000000000 -0500
@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
@@ -47096,9 +46770,18 @@ diff -urNp linux-2.6.32.27/include/linux/compiler.h linux-2.6.32.27/include/linu
/* Simple shorthand for a section definition */
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
+@@ -278,6 +294,7 @@ void ftrace_likely_update(struct ftrace_
+ * use is to mediate communication between process-level code and irq/NMI
+ * handlers, all running on the same CPU.
+ */
+-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
++#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
++#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
+
+ #endif /* __LINUX_COMPILER_H */
diff -urNp linux-2.6.32.27/include/linux/decompress/mm.h linux-2.6.32.27/include/linux/decompress/mm.h
--- linux-2.6.32.27/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/decompress/mm.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/decompress/mm.h 2010-12-31 14:46:53.000000000 -0500
@@ -78,7 +78,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
@@ -47110,7 +46793,7 @@ diff -urNp linux-2.6.32.27/include/linux/decompress/mm.h linux-2.6.32.27/include
#define large_malloc(a) vmalloc(a)
diff -urNp linux-2.6.32.27/include/linux/dma-mapping.h linux-2.6.32.27/include/linux/dma-mapping.h
--- linux-2.6.32.27/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/dma-mapping.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -16,50 +16,50 @@ enum dma_data_direction {
};
@@ -47179,7 +46862,7 @@ diff -urNp linux-2.6.32.27/include/linux/dma-mapping.h linux-2.6.32.27/include/l
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
diff -urNp linux-2.6.32.27/include/linux/dst.h linux-2.6.32.27/include/linux/dst.h
--- linux-2.6.32.27/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/dst.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/dst.h 2010-12-31 14:46:53.000000000 -0500
@@ -380,7 +380,7 @@ struct dst_node
struct thread_pool *pool;
@@ -47191,7 +46874,7 @@ diff -urNp linux-2.6.32.27/include/linux/dst.h linux-2.6.32.27/include/linux/dst
* How frequently and how many times transaction
diff -urNp linux-2.6.32.27/include/linux/elf.h linux-2.6.32.27/include/linux/elf.h
--- linux-2.6.32.27/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/elf.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -47266,7 +46949,7 @@ diff -urNp linux-2.6.32.27/include/linux/elf.h linux-2.6.32.27/include/linux/elf
diff -urNp linux-2.6.32.27/include/linux/fs.h linux-2.6.32.27/include/linux/fs.h
--- linux-2.6.32.27/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/fs.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/fs.h 2010-12-31 14:46:53.000000000 -0500
@@ -90,6 +90,11 @@ struct inodes_stat_t {
/* Expect random access pattern */
#define FMODE_RANDOM ((__force fmode_t)4096)
@@ -47430,7 +47113,7 @@ diff -urNp linux-2.6.32.27/include/linux/fs.h linux-2.6.32.27/include/linux/fs.h
/*
diff -urNp linux-2.6.32.27/include/linux/fs_struct.h linux-2.6.32.27/include/linux/fs_struct.h
--- linux-2.6.32.27/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/fs_struct.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/fs_struct.h 2010-12-31 14:46:53.000000000 -0500
@@ -4,7 +4,7 @@
#include <linux/path.h>
@@ -47442,7 +47125,7 @@ diff -urNp linux-2.6.32.27/include/linux/fs_struct.h linux-2.6.32.27/include/lin
int in_exec;
diff -urNp linux-2.6.32.27/include/linux/genhd.h linux-2.6.32.27/include/linux/genhd.h
--- linux-2.6.32.27/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/genhd.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/genhd.h 2010-12-31 14:46:53.000000000 -0500
@@ -161,7 +161,7 @@ struct gendisk {
struct timer_rand_state *random;
@@ -47454,7 +47137,7 @@ diff -urNp linux-2.6.32.27/include/linux/genhd.h linux-2.6.32.27/include/linux/g
struct blk_integrity *integrity;
diff -urNp linux-2.6.32.27/include/linux/gracl.h linux-2.6.32.27/include/linux/gracl.h
--- linux-2.6.32.27/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/include/linux/gracl.h 2010-12-18 19:40:30.000000000 -0500
++++ linux-2.6.32.27/include/linux/gracl.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,317 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -47775,7 +47458,7 @@ diff -urNp linux-2.6.32.27/include/linux/gracl.h linux-2.6.32.27/include/linux/g
+
diff -urNp linux-2.6.32.27/include/linux/gralloc.h linux-2.6.32.27/include/linux/gralloc.h
--- linux-2.6.32.27/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/include/linux/gralloc.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/gralloc.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -47788,7 +47471,7 @@ diff -urNp linux-2.6.32.27/include/linux/gralloc.h linux-2.6.32.27/include/linux
+#endif
diff -urNp linux-2.6.32.27/include/linux/grdefs.h linux-2.6.32.27/include/linux/grdefs.h
--- linux-2.6.32.27/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/include/linux/grdefs.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/grdefs.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,137 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
@@ -47929,7 +47612,7 @@ diff -urNp linux-2.6.32.27/include/linux/grdefs.h linux-2.6.32.27/include/linux/
+#endif
diff -urNp linux-2.6.32.27/include/linux/grinternal.h linux-2.6.32.27/include/linux/grinternal.h
--- linux-2.6.32.27/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/include/linux/grinternal.h 2010-12-12 17:08:08.000000000 -0500
++++ linux-2.6.32.27/include/linux/grinternal.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,216 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
@@ -48149,7 +47832,7 @@ diff -urNp linux-2.6.32.27/include/linux/grinternal.h linux-2.6.32.27/include/li
+#endif
diff -urNp linux-2.6.32.27/include/linux/grmsg.h linux-2.6.32.27/include/linux/grmsg.h
--- linux-2.6.32.27/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/include/linux/grmsg.h 2010-12-12 17:19:08.000000000 -0500
++++ linux-2.6.32.27/include/linux/grmsg.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,111 @@
+#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"
@@ -48264,7 +47947,7 @@ diff -urNp linux-2.6.32.27/include/linux/grmsg.h linux-2.6.32.27/include/linux/g
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
diff -urNp linux-2.6.32.27/include/linux/grsecurity.h linux-2.6.32.27/include/linux/grsecurity.h
--- linux-2.6.32.27/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/include/linux/grsecurity.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/grsecurity.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,210 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
@@ -48478,7 +48161,7 @@ diff -urNp linux-2.6.32.27/include/linux/grsecurity.h linux-2.6.32.27/include/li
+#endif
diff -urNp linux-2.6.32.27/include/linux/hdpu_features.h linux-2.6.32.27/include/linux/hdpu_features.h
--- linux-2.6.32.27/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/hdpu_features.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/hdpu_features.h 2010-12-31 14:46:53.000000000 -0500
@@ -3,7 +3,7 @@
struct cpustate_t {
spinlock_t lock;
@@ -48490,7 +48173,7 @@ diff -urNp linux-2.6.32.27/include/linux/hdpu_features.h linux-2.6.32.27/include
unsigned long *set_addr;
diff -urNp linux-2.6.32.27/include/linux/highmem.h linux-2.6.32.27/include/linux/highmem.h
--- linux-2.6.32.27/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/highmem.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/highmem.h 2010-12-31 14:46:53.000000000 -0500
@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -48512,7 +48195,7 @@ diff -urNp linux-2.6.32.27/include/linux/highmem.h linux-2.6.32.27/include/linux
unsigned start2, unsigned end2)
diff -urNp linux-2.6.32.27/include/linux/interrupt.h linux-2.6.32.27/include/linux/interrupt.h
--- linux-2.6.32.27/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/interrupt.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/interrupt.h 2010-12-31 14:46:53.000000000 -0500
@@ -362,7 +362,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
@@ -48539,7 +48222,7 @@ diff -urNp linux-2.6.32.27/include/linux/interrupt.h linux-2.6.32.27/include/lin
extern void raise_softirq_irqoff(unsigned int nr);
diff -urNp linux-2.6.32.27/include/linux/jbd2.h linux-2.6.32.27/include/linux/jbd2.h
--- linux-2.6.32.27/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/jbd2.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/jbd2.h 2010-12-31 14:46:53.000000000 -0500
@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
@@ -48551,7 +48234,7 @@ diff -urNp linux-2.6.32.27/include/linux/jbd2.h linux-2.6.32.27/include/linux/jb
static inline void *jbd2_alloc(size_t size, gfp_t flags)
diff -urNp linux-2.6.32.27/include/linux/jbd.h linux-2.6.32.27/include/linux/jbd.h
--- linux-2.6.32.27/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/jbd.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/jbd.h 2010-12-31 14:46:53.000000000 -0500
@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
@@ -48563,7 +48246,7 @@ diff -urNp linux-2.6.32.27/include/linux/jbd.h linux-2.6.32.27/include/linux/jbd
static inline void *jbd_alloc(size_t size, gfp_t flags)
diff -urNp linux-2.6.32.27/include/linux/kallsyms.h linux-2.6.32.27/include/linux/kallsyms.h
--- linux-2.6.32.27/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/kallsyms.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/kallsyms.h 2010-12-31 14:53:51.000000000 -0500
@@ -15,7 +15,8 @@
struct module;
@@ -48574,11 +48257,12 @@ diff -urNp linux-2.6.32.27/include/linux/kallsyms.h linux-2.6.32.27/include/linu
/* Lookup the address for a symbol. Returns 0 if not found. */
unsigned long kallsyms_lookup_name(const char *name);
-@@ -92,6 +93,14 @@ static inline int lookup_symbol_attrs(un
+@@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(un
/* Stupid that this does nothing, but I didn't create this mess. */
#define __print_symbol(fmt, addr)
#endif /*CONFIG_KALLSYMS*/
-+#else /* when included by kallsyms.c or vsnprintf.c, with HIDESYM enabled */
++#else /* when included by kallsyms.c, vsnprintf.c, or
++ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
+extern void __print_symbol(const char *fmt, unsigned long address);
+extern int sprint_symbol(char *buffer, unsigned long address);
+const char *kallsyms_lookup(unsigned long addr,
@@ -48591,7 +48275,7 @@ diff -urNp linux-2.6.32.27/include/linux/kallsyms.h linux-2.6.32.27/include/linu
static void __check_printsym_format(const char *fmt, ...)
diff -urNp linux-2.6.32.27/include/linux/kgdb.h linux-2.6.32.27/include/linux/kgdb.h
--- linux-2.6.32.27/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/kgdb.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/kgdb.h 2010-12-31 14:46:53.000000000 -0500
@@ -251,20 +251,20 @@ struct kgdb_arch {
*/
struct kgdb_io {
@@ -48624,7 +48308,7 @@ diff -urNp linux-2.6.32.27/include/linux/kgdb.h linux-2.6.32.27/include/linux/kg
extern int kgdb_mem2hex(char *mem, char *buf, int count);
diff -urNp linux-2.6.32.27/include/linux/kobject.h linux-2.6.32.27/include/linux/kobject.h
--- linux-2.6.32.27/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/kobject.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/kobject.h 2010-12-31 14:46:53.000000000 -0500
@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
struct kobj_type {
@@ -48675,7 +48359,7 @@ diff -urNp linux-2.6.32.27/include/linux/kobject.h linux-2.6.32.27/include/linux
static inline struct kset *to_kset(struct kobject *kobj)
diff -urNp linux-2.6.32.27/include/linux/kvm_host.h linux-2.6.32.27/include/linux/kvm_host.h
--- linux-2.6.32.27/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/kvm_host.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
@@ -48696,7 +48380,7 @@ diff -urNp linux-2.6.32.27/include/linux/kvm_host.h linux-2.6.32.27/include/linu
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
diff -urNp linux-2.6.32.27/include/linux/libata.h linux-2.6.32.27/include/linux/libata.h
--- linux-2.6.32.27/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/include/linux/libata.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/libata.h 2010-12-31 14:46:53.000000000 -0500
@@ -64,11 +64,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -48764,7 +48448,7 @@ diff -urNp linux-2.6.32.27/include/linux/libata.h linux-2.6.32.27/include/linux/
extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
diff -urNp linux-2.6.32.27/include/linux/lockd/bind.h linux-2.6.32.27/include/linux/lockd/bind.h
--- linux-2.6.32.27/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/lockd/bind.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/lockd/bind.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,13 +23,13 @@ struct svc_rqst;
* This is the set of functions for lockd->nfsd communication
*/
@@ -48784,7 +48468,7 @@ diff -urNp linux-2.6.32.27/include/linux/lockd/bind.h linux-2.6.32.27/include/li
* Similar to nfs_client_initdata, but without the NFS-specific
diff -urNp linux-2.6.32.27/include/linux/mm.h linux-2.6.32.27/include/linux/mm.h
--- linux-2.6.32.27/include/linux/mm.h 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/include/linux/mm.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/mm.h 2010-12-31 14:46:53.000000000 -0500
@@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -48866,7 +48550,7 @@ diff -urNp linux-2.6.32.27/include/linux/mm.h linux-2.6.32.27/include/linux/mm.h
#endif /* _LINUX_MM_H */
diff -urNp linux-2.6.32.27/include/linux/mm_types.h linux-2.6.32.27/include/linux/mm_types.h
--- linux-2.6.32.27/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.27/include/linux/mm_types.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/mm_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -186,6 +186,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -48903,7 +48587,7 @@ diff -urNp linux-2.6.32.27/include/linux/mm_types.h linux-2.6.32.27/include/linu
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
diff -urNp linux-2.6.32.27/include/linux/mmu_notifier.h linux-2.6.32.27/include/linux/mmu_notifier.h
--- linux-2.6.32.27/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/mmu_notifier.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/mmu_notifier.h 2010-12-31 14:46:53.000000000 -0500
@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -48922,7 +48606,7 @@ diff -urNp linux-2.6.32.27/include/linux/mmu_notifier.h linux-2.6.32.27/include/
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
diff -urNp linux-2.6.32.27/include/linux/mmzone.h linux-2.6.32.27/include/linux/mmzone.h
--- linux-2.6.32.27/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/include/linux/mmzone.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/mmzone.h 2010-12-31 14:46:53.000000000 -0500
@@ -350,7 +350,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
@@ -48934,7 +48618,7 @@ diff -urNp linux-2.6.32.27/include/linux/mmzone.h linux-2.6.32.27/include/linux/
* prev_priority holds the scanning priority for this zone. It is
diff -urNp linux-2.6.32.27/include/linux/mod_devicetable.h linux-2.6.32.27/include/linux/mod_devicetable.h
--- linux-2.6.32.27/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/mod_devicetable.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/mod_devicetable.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -48955,7 +48639,7 @@ diff -urNp linux-2.6.32.27/include/linux/mod_devicetable.h linux-2.6.32.27/inclu
__u16 bus;
diff -urNp linux-2.6.32.27/include/linux/module.h linux-2.6.32.27/include/linux/module.h
--- linux-2.6.32.27/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/module.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/module.h 2010-12-31 14:46:53.000000000 -0500
@@ -287,16 +287,16 @@ struct module
int (*init)(void);
@@ -49030,7 +48714,7 @@ diff -urNp linux-2.6.32.27/include/linux/module.h linux-2.6.32.27/include/linux/
/* Search for module by name: must hold module_mutex. */
diff -urNp linux-2.6.32.27/include/linux/moduleloader.h linux-2.6.32.27/include/linux/moduleloader.h
--- linux-2.6.32.27/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/moduleloader.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/moduleloader.h 2010-12-31 14:46:53.000000000 -0500
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -49055,7 +48739,7 @@ diff -urNp linux-2.6.32.27/include/linux/moduleloader.h linux-2.6.32.27/include/
int apply_relocate(Elf_Shdr *sechdrs,
diff -urNp linux-2.6.32.27/include/linux/moduleparam.h linux-2.6.32.27/include/linux/moduleparam.h
--- linux-2.6.32.27/include/linux/moduleparam.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/moduleparam.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/moduleparam.h 2010-12-31 14:46:53.000000000 -0500
@@ -132,7 +132,7 @@ struct kparam_array
/* Actually copy string: maxlen param is usually sizeof(string). */
@@ -49076,7 +48760,7 @@ diff -urNp linux-2.6.32.27/include/linux/moduleparam.h linux-2.6.32.27/include/l
__module_param_call(MODULE_PARAM_PREFIX, name, \
diff -urNp linux-2.6.32.27/include/linux/namei.h linux-2.6.32.27/include/linux/namei.h
--- linux-2.6.32.27/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/namei.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/namei.h 2010-12-31 14:46:53.000000000 -0500
@@ -22,7 +22,7 @@ struct nameidata {
unsigned int flags;
int last_type;
@@ -49103,7 +48787,7 @@ diff -urNp linux-2.6.32.27/include/linux/namei.h linux-2.6.32.27/include/linux/n
}
diff -urNp linux-2.6.32.27/include/linux/netfilter/xt_gradm.h linux-2.6.32.27/include/linux/netfilter/xt_gradm.h
--- linux-2.6.32.27/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/include/linux/netfilter/xt_gradm.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/netfilter/xt_gradm.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef _LINUX_NETFILTER_XT_GRADM_H
+#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -49116,7 +48800,7 @@ diff -urNp linux-2.6.32.27/include/linux/netfilter/xt_gradm.h linux-2.6.32.27/in
+#endif
diff -urNp linux-2.6.32.27/include/linux/nodemask.h linux-2.6.32.27/include/linux/nodemask.h
--- linux-2.6.32.27/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/nodemask.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/nodemask.h 2010-12-31 14:46:53.000000000 -0500
@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
#define any_online_node(mask) \
@@ -49135,7 +48819,7 @@ diff -urNp linux-2.6.32.27/include/linux/nodemask.h linux-2.6.32.27/include/linu
#define num_online_nodes() num_node_state(N_ONLINE)
diff -urNp linux-2.6.32.27/include/linux/oprofile.h linux-2.6.32.27/include/linux/oprofile.h
--- linux-2.6.32.27/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/oprofile.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/oprofile.h 2010-12-31 14:46:53.000000000 -0500
@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
char const * name, ulong * val);
@@ -49150,7 +48834,7 @@ diff -urNp linux-2.6.32.27/include/linux/oprofile.h linux-2.6.32.27/include/linu
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
diff -urNp linux-2.6.32.27/include/linux/pipe_fs_i.h linux-2.6.32.27/include/linux/pipe_fs_i.h
--- linux-2.6.32.27/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/pipe_fs_i.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/pipe_fs_i.h 2010-12-31 14:46:53.000000000 -0500
@@ -46,9 +46,9 @@ struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf;
@@ -49166,7 +48850,7 @@ diff -urNp linux-2.6.32.27/include/linux/pipe_fs_i.h linux-2.6.32.27/include/lin
struct fasync_struct *fasync_readers;
diff -urNp linux-2.6.32.27/include/linux/poison.h linux-2.6.32.27/include/linux/poison.h
--- linux-2.6.32.27/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/poison.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/poison.h 2010-12-31 14:46:53.000000000 -0500
@@ -19,8 +19,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
@@ -49180,7 +48864,7 @@ diff -urNp linux-2.6.32.27/include/linux/poison.h linux-2.6.32.27/include/linux/
/*
diff -urNp linux-2.6.32.27/include/linux/proc_fs.h linux-2.6.32.27/include/linux/proc_fs.h
--- linux-2.6.32.27/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/proc_fs.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/proc_fs.h 2010-12-31 14:46:53.000000000 -0500
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
@@ -49203,7 +48887,7 @@ diff -urNp linux-2.6.32.27/include/linux/proc_fs.h linux-2.6.32.27/include/linux
read_proc_t *read_proc, void * data)
diff -urNp linux-2.6.32.27/include/linux/random.h linux-2.6.32.27/include/linux/random.h
--- linux-2.6.32.27/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/random.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/random.h 2010-12-31 14:46:53.000000000 -0500
@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
u32 random32(void);
void srandom32(u32 seed);
@@ -49218,7 +48902,7 @@ diff -urNp linux-2.6.32.27/include/linux/random.h linux-2.6.32.27/include/linux/
#endif /* _LINUX_RANDOM_H */
diff -urNp linux-2.6.32.27/include/linux/reiserfs_fs.h linux-2.6.32.27/include/linux/reiserfs_fs.h
--- linux-2.6.32.27/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/reiserfs_fs.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/reiserfs_fs.h 2010-12-31 14:46:53.000000000 -0500
@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
@@ -49267,7 +48951,7 @@ diff -urNp linux-2.6.32.27/include/linux/reiserfs_fs.h linux-2.6.32.27/include/l
#define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
diff -urNp linux-2.6.32.27/include/linux/reiserfs_fs_sb.h linux-2.6.32.27/include/linux/reiserfs_fs_sb.h
--- linux-2.6.32.27/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/reiserfs_fs_sb.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/reiserfs_fs_sb.h 2010-12-31 14:46:53.000000000 -0500
@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
@@ -49279,7 +48963,7 @@ diff -urNp linux-2.6.32.27/include/linux/reiserfs_fs_sb.h linux-2.6.32.27/includ
on-disk FS format */
diff -urNp linux-2.6.32.27/include/linux/sched.h linux-2.6.32.27/include/linux/sched.h
--- linux-2.6.32.27/include/linux/sched.h 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/include/linux/sched.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/sched.h 2010-12-31 14:46:53.000000000 -0500
@@ -101,6 +101,7 @@ struct bio;
struct fs_struct;
struct bts_context;
@@ -49496,7 +49180,7 @@ diff -urNp linux-2.6.32.27/include/linux/sched.h linux-2.6.32.27/include/linux/s
#ifdef CONFIG_DEBUG_STACK_USAGE
diff -urNp linux-2.6.32.27/include/linux/screen_info.h linux-2.6.32.27/include/linux/screen_info.h
--- linux-2.6.32.27/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/screen_info.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/screen_info.h 2010-12-31 14:46:53.000000000 -0500
@@ -42,7 +42,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
@@ -49509,7 +49193,7 @@ diff -urNp linux-2.6.32.27/include/linux/screen_info.h linux-2.6.32.27/include/l
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
diff -urNp linux-2.6.32.27/include/linux/security.h linux-2.6.32.27/include/linux/security.h
--- linux-2.6.32.27/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/security.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/security.h 2010-12-31 14:46:53.000000000 -0500
@@ -34,6 +34,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
@@ -49520,7 +49204,7 @@ diff -urNp linux-2.6.32.27/include/linux/security.h linux-2.6.32.27/include/linu
/* Maximum number of letters for an LSM name string */
diff -urNp linux-2.6.32.27/include/linux/shm.h linux-2.6.32.27/include/linux/shm.h
--- linux-2.6.32.27/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/shm.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/shm.h 2010-12-31 14:46:53.000000000 -0500
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
@@ -49534,7 +49218,7 @@ diff -urNp linux-2.6.32.27/include/linux/shm.h linux-2.6.32.27/include/linux/shm
/* shm_mode upper byte flags */
diff -urNp linux-2.6.32.27/include/linux/skbuff.h linux-2.6.32.27/include/linux/skbuff.h
--- linux-2.6.32.27/include/linux/skbuff.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/skbuff.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/skbuff.h 2010-12-31 14:46:53.000000000 -0500
@@ -544,7 +544,7 @@ static inline union skb_shared_tx *skb_t
*/
static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -49564,7 +49248,7 @@ diff -urNp linux-2.6.32.27/include/linux/skbuff.h linux-2.6.32.27/include/linux/
/**
diff -urNp linux-2.6.32.27/include/linux/slab.h linux-2.6.32.27/include/linux/slab.h
--- linux-2.6.32.27/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/slab.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/slab.h 2010-12-31 14:46:53.000000000 -0500
@@ -11,6 +11,7 @@
#include <linux/gfp.h>
@@ -49638,7 +49322,7 @@ diff -urNp linux-2.6.32.27/include/linux/slab.h linux-2.6.32.27/include/linux/sl
#endif /* _LINUX_SLAB_H */
diff -urNp linux-2.6.32.27/include/linux/slub_def.h linux-2.6.32.27/include/linux/slub_def.h
--- linux-2.6.32.27/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/slub_def.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/slub_def.h 2010-12-31 14:46:53.000000000 -0500
@@ -86,7 +86,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
@@ -49650,7 +49334,7 @@ diff -urNp linux-2.6.32.27/include/linux/slub_def.h linux-2.6.32.27/include/linu
int align; /* Alignment */
diff -urNp linux-2.6.32.27/include/linux/sonet.h linux-2.6.32.27/include/linux/sonet.h
--- linux-2.6.32.27/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/sonet.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/sonet.h 2010-12-31 14:46:53.000000000 -0500
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
@@ -49662,7 +49346,7 @@ diff -urNp linux-2.6.32.27/include/linux/sonet.h linux-2.6.32.27/include/linux/s
};
diff -urNp linux-2.6.32.27/include/linux/sunrpc/clnt.h linux-2.6.32.27/include/linux/sunrpc/clnt.h
--- linux-2.6.32.27/include/linux/sunrpc/clnt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/sunrpc/clnt.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/sunrpc/clnt.h 2010-12-31 14:46:53.000000000 -0500
@@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por
{
switch (sap->sa_family) {
@@ -49695,7 +49379,7 @@ diff -urNp linux-2.6.32.27/include/linux/sunrpc/clnt.h linux-2.6.32.27/include/l
#endif /* __KERNEL__ */
diff -urNp linux-2.6.32.27/include/linux/suspend.h linux-2.6.32.27/include/linux/suspend.h
--- linux-2.6.32.27/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/suspend.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/suspend.h 2010-12-31 14:46:53.000000000 -0500
@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
@@ -49786,7 +49470,7 @@ diff -urNp linux-2.6.32.27/include/linux/suspend.h linux-2.6.32.27/include/linux
#endif /* CONFIG_HIBERNATION */
diff -urNp linux-2.6.32.27/include/linux/sysctl.h linux-2.6.32.27/include/linux/sysctl.h
--- linux-2.6.32.27/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/sysctl.h 2010-12-09 19:55:40.000000000 -0500
++++ linux-2.6.32.27/include/linux/sysctl.h 2010-12-31 14:46:53.000000000 -0500
@@ -164,7 +164,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
@@ -49819,7 +49503,7 @@ diff -urNp linux-2.6.32.27/include/linux/sysctl.h linux-2.6.32.27/include/linux/
extern ctl_handler sysctl_ms_jiffies;
diff -urNp linux-2.6.32.27/include/linux/sysfs.h linux-2.6.32.27/include/linux/sysfs.h
--- linux-2.6.32.27/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/sysfs.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/sysfs.h 2010-12-31 14:46:53.000000000 -0500
@@ -75,8 +75,8 @@ struct bin_attribute {
};
@@ -49833,7 +49517,7 @@ diff -urNp linux-2.6.32.27/include/linux/sysfs.h linux-2.6.32.27/include/linux/s
struct sysfs_dirent;
diff -urNp linux-2.6.32.27/include/linux/thread_info.h linux-2.6.32.27/include/linux/thread_info.h
--- linux-2.6.32.27/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/thread_info.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/thread_info.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,7 +23,7 @@ struct restart_block {
};
/* For futex_wait and futex_wait_requeue_pi */
@@ -49845,7 +49529,7 @@ diff -urNp linux-2.6.32.27/include/linux/thread_info.h linux-2.6.32.27/include/l
u32 bitset;
diff -urNp linux-2.6.32.27/include/linux/tty.h linux-2.6.32.27/include/linux/tty.h
--- linux-2.6.32.27/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/tty.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/tty.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
@@ -49883,7 +49567,7 @@ diff -urNp linux-2.6.32.27/include/linux/tty.h linux-2.6.32.27/include/linux/tty
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
diff -urNp linux-2.6.32.27/include/linux/tty_ldisc.h linux-2.6.32.27/include/linux/tty_ldisc.h
--- linux-2.6.32.27/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/tty_ldisc.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/tty_ldisc.h 2010-12-31 14:46:53.000000000 -0500
@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -49895,7 +49579,7 @@ diff -urNp linux-2.6.32.27/include/linux/tty_ldisc.h linux-2.6.32.27/include/lin
struct tty_ldisc {
diff -urNp linux-2.6.32.27/include/linux/types.h linux-2.6.32.27/include/linux/types.h
--- linux-2.6.32.27/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/types.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/types.h 2010-12-31 14:46:53.000000000 -0500
@@ -191,10 +191,26 @@ typedef struct {
volatile int counter;
} atomic_t;
@@ -49925,7 +49609,7 @@ diff -urNp linux-2.6.32.27/include/linux/types.h linux-2.6.32.27/include/linux/t
struct ustat {
diff -urNp linux-2.6.32.27/include/linux/uaccess.h linux-2.6.32.27/include/linux/uaccess.h
--- linux-2.6.32.27/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/uaccess.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
@@ -49959,7 +49643,7 @@ diff -urNp linux-2.6.32.27/include/linux/uaccess.h linux-2.6.32.27/include/linux
#endif /* __LINUX_UACCESS_H__ */
diff -urNp linux-2.6.32.27/include/linux/unaligned/access_ok.h linux-2.6.32.27/include/linux/unaligned/access_ok.h
--- linux-2.6.32.27/include/linux/unaligned/access_ok.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/unaligned/access_ok.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/unaligned/access_ok.h 2010-12-31 14:46:53.000000000 -0500
@@ -6,32 +6,32 @@
static inline u16 get_unaligned_le16(const void *p)
@@ -50001,7 +49685,7 @@ diff -urNp linux-2.6.32.27/include/linux/unaligned/access_ok.h linux-2.6.32.27/i
static inline void put_unaligned_le16(u16 val, void *p)
diff -urNp linux-2.6.32.27/include/linux/vmalloc.h linux-2.6.32.27/include/linux/vmalloc.h
--- linux-2.6.32.27/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/linux/vmalloc.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/vmalloc.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
#define VM_MAP 0x00000004 /* vmap()ed pages */
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -50098,7 +49782,7 @@ diff -urNp linux-2.6.32.27/include/linux/vmalloc.h linux-2.6.32.27/include/linux
#endif /* _LINUX_VMALLOC_H */
diff -urNp linux-2.6.32.27/include/linux/vmstat.h linux-2.6.32.27/include/linux/vmstat.h
--- linux-2.6.32.27/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/include/linux/vmstat.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/linux/vmstat.h 2010-12-31 14:46:53.000000000 -0500
@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
/*
* Zone based page accounting with per cpu differentials.
@@ -50164,7 +49848,7 @@ diff -urNp linux-2.6.32.27/include/linux/vmstat.h linux-2.6.32.27/include/linux/
static inline void __dec_zone_page_state(struct page *page,
diff -urNp linux-2.6.32.27/include/net/inetpeer.h linux-2.6.32.27/include/net/inetpeer.h
--- linux-2.6.32.27/include/net/inetpeer.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/net/inetpeer.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/net/inetpeer.h 2010-12-31 14:46:53.000000000 -0500
@@ -24,7 +24,7 @@ struct inet_peer
__u32 dtime; /* the time of last use of not
* referenced entries */
@@ -50176,7 +49860,7 @@ diff -urNp linux-2.6.32.27/include/net/inetpeer.h linux-2.6.32.27/include/net/in
};
diff -urNp linux-2.6.32.27/include/net/irda/ircomm_tty.h linux-2.6.32.27/include/net/irda/ircomm_tty.h
--- linux-2.6.32.27/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/net/irda/ircomm_tty.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/net/irda/ircomm_tty.h 2010-12-31 14:46:53.000000000 -0500
@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
unsigned short close_delay;
unsigned short closing_wait; /* time to wait before closing */
@@ -50190,7 +49874,7 @@ diff -urNp linux-2.6.32.27/include/net/irda/ircomm_tty.h linux-2.6.32.27/include
* o self->open_count
diff -urNp linux-2.6.32.27/include/net/neighbour.h linux-2.6.32.27/include/net/neighbour.h
--- linux-2.6.32.27/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/net/neighbour.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/net/neighbour.h 2010-12-31 14:46:53.000000000 -0500
@@ -125,12 +125,12 @@ struct neighbour
struct neigh_ops
{
@@ -50212,7 +49896,7 @@ diff -urNp linux-2.6.32.27/include/net/neighbour.h linux-2.6.32.27/include/net/n
struct pneigh_entry
diff -urNp linux-2.6.32.27/include/net/netlink.h linux-2.6.32.27/include/net/netlink.h
--- linux-2.6.32.27/include/net/netlink.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/net/netlink.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/net/netlink.h 2010-12-31 14:46:53.000000000 -0500
@@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
{
@@ -50224,7 +49908,7 @@ diff -urNp linux-2.6.32.27/include/net/netlink.h linux-2.6.32.27/include/net/net
/**
diff -urNp linux-2.6.32.27/include/net/sctp/sctp.h linux-2.6.32.27/include/net/sctp/sctp.h
--- linux-2.6.32.27/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/net/sctp/sctp.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/net/sctp/sctp.h 2010-12-31 14:46:53.000000000 -0500
@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
#else /* SCTP_DEBUG */
@@ -50238,7 +49922,7 @@ diff -urNp linux-2.6.32.27/include/net/sctp/sctp.h linux-2.6.32.27/include/net/s
#define SCTP_ASSERT(expr, str, func)
diff -urNp linux-2.6.32.27/include/net/tcp.h linux-2.6.32.27/include/net/tcp.h
--- linux-2.6.32.27/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/include/net/tcp.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/net/tcp.h 2010-12-31 14:46:53.000000000 -0500
@@ -1444,6 +1444,7 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
@@ -50249,7 +49933,7 @@ diff -urNp linux-2.6.32.27/include/net/tcp.h linux-2.6.32.27/include/net/tcp.h
};
diff -urNp linux-2.6.32.27/include/net/udp.h linux-2.6.32.27/include/net/udp.h
--- linux-2.6.32.27/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/net/udp.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/net/udp.h 2010-12-31 14:46:53.000000000 -0500
@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
@@ -50260,7 +49944,7 @@ diff -urNp linux-2.6.32.27/include/net/udp.h linux-2.6.32.27/include/net/udp.h
};
diff -urNp linux-2.6.32.27/include/sound/ac97_codec.h linux-2.6.32.27/include/sound/ac97_codec.h
--- linux-2.6.32.27/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/sound/ac97_codec.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/sound/ac97_codec.h 2010-12-31 14:46:53.000000000 -0500
@@ -419,15 +419,15 @@
struct snd_ac97;
@@ -50295,7 +49979,7 @@ diff -urNp linux-2.6.32.27/include/sound/ac97_codec.h linux-2.6.32.27/include/so
/* --- */
diff -urNp linux-2.6.32.27/include/trace/events/irq.h linux-2.6.32.27/include/trace/events/irq.h
--- linux-2.6.32.27/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/trace/events/irq.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/trace/events/irq.h 2010-12-31 14:46:53.000000000 -0500
@@ -34,7 +34,7 @@
*/
TRACE_EVENT(irq_handler_entry,
@@ -50334,7 +50018,7 @@ diff -urNp linux-2.6.32.27/include/trace/events/irq.h linux-2.6.32.27/include/tr
diff -urNp linux-2.6.32.27/include/video/uvesafb.h linux-2.6.32.27/include/video/uvesafb.h
--- linux-2.6.32.27/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/include/video/uvesafb.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/include/video/uvesafb.h 2010-12-31 14:46:53.000000000 -0500
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
@@ -50345,7 +50029,7 @@ diff -urNp linux-2.6.32.27/include/video/uvesafb.h linux-2.6.32.27/include/video
u8 *vbe_state_orig; /*
diff -urNp linux-2.6.32.27/init/do_mounts.c linux-2.6.32.27/init/do_mounts.c
--- linux-2.6.32.27/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/init/do_mounts.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/init/do_mounts.c 2010-12-31 14:46:53.000000000 -0500
@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -50393,7 +50077,7 @@ diff -urNp linux-2.6.32.27/init/do_mounts.c linux-2.6.32.27/init/do_mounts.c
}
diff -urNp linux-2.6.32.27/init/do_mounts.h linux-2.6.32.27/init/do_mounts.h
--- linux-2.6.32.27/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/init/do_mounts.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/init/do_mounts.h 2010-12-31 14:46:53.000000000 -0500
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
@@ -50415,7 +50099,7 @@ diff -urNp linux-2.6.32.27/init/do_mounts.h linux-2.6.32.27/init/do_mounts.h
return 0;
diff -urNp linux-2.6.32.27/init/do_mounts_initrd.c linux-2.6.32.27/init/do_mounts_initrd.c
--- linux-2.6.32.27/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/init/do_mounts_initrd.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/init/do_mounts_initrd.c 2010-12-31 14:46:53.000000000 -0500
@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
sys_close(old_fd);sys_close(root_fd);
sys_close(0);sys_close(1);sys_close(2);
@@ -50501,7 +50185,7 @@ diff -urNp linux-2.6.32.27/init/do_mounts_initrd.c linux-2.6.32.27/init/do_mount
}
diff -urNp linux-2.6.32.27/init/do_mounts_md.c linux-2.6.32.27/init/do_mounts_md.c
--- linux-2.6.32.27/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/init/do_mounts_md.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/init/do_mounts_md.c 2010-12-31 14:46:53.000000000 -0500
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
@@ -50531,7 +50215,7 @@ diff -urNp linux-2.6.32.27/init/do_mounts_md.c linux-2.6.32.27/init/do_mounts_md
sys_close(fd);
diff -urNp linux-2.6.32.27/init/initramfs.c linux-2.6.32.27/init/initramfs.c
--- linux-2.6.32.27/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/init/initramfs.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/init/initramfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
@@ -50642,7 +50326,7 @@ diff -urNp linux-2.6.32.27/init/initramfs.c linux-2.6.32.27/init/initramfs.c
return 0;
diff -urNp linux-2.6.32.27/init/Kconfig linux-2.6.32.27/init/Kconfig
--- linux-2.6.32.27/init/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/init/Kconfig 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/init/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
config COMPAT_BRK
@@ -50654,7 +50338,7 @@ diff -urNp linux-2.6.32.27/init/Kconfig linux-2.6.32.27/init/Kconfig
also breaks ancient binaries (including anything libc5 based).
diff -urNp linux-2.6.32.27/init/main.c linux-2.6.32.27/init/main.c
--- linux-2.6.32.27/init/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/init/main.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/init/main.c 2010-12-31 14:47:01.000000000 -0500
@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
#ifdef CONFIG_TC
extern void tc_init(void);
@@ -50663,7 +50347,7 @@ diff -urNp linux-2.6.32.27/init/main.c linux-2.6.32.27/init/main.c
enum system_states system_state __read_mostly;
EXPORT_SYMBOL(system_state);
-@@ -183,6 +184,45 @@ static int __init set_reset_devices(char
+@@ -183,6 +184,47 @@ static int __init set_reset_devices(char
__setup("reset_devices", set_reset_devices);
@@ -50682,6 +50366,8 @@ diff -urNp linux-2.6.32.27/init/main.c linux-2.6.32.27/init/main.c
+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
+ get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_DS].type = 3;
+ get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_DS].limit = 0xf;
++ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
++ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
+ }
+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
+#else
@@ -50709,7 +50395,7 @@ diff -urNp linux-2.6.32.27/init/main.c linux-2.6.32.27/init/main.c
static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
static const char *panic_later, *panic_param;
-@@ -697,52 +737,53 @@ int initcall_debug;
+@@ -697,52 +739,53 @@ int initcall_debug;
core_param(initcall_debug, initcall_debug, bool, 0644);
static char msgbuf[64];
@@ -50779,7 +50465,7 @@ diff -urNp linux-2.6.32.27/init/main.c linux-2.6.32.27/init/main.c
}
-@@ -881,11 +922,13 @@ static int __init kernel_init(void * unu
+@@ -881,11 +924,13 @@ static int __init kernel_init(void * unu
if (!ramdisk_execute_command)
ramdisk_execute_command = "/init";
@@ -50796,7 +50482,7 @@ diff -urNp linux-2.6.32.27/init/main.c linux-2.6.32.27/init/main.c
* we're essentially up and running. Get rid of the
diff -urNp linux-2.6.32.27/init/noinitramfs.c linux-2.6.32.27/init/noinitramfs.c
--- linux-2.6.32.27/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/init/noinitramfs.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/init/noinitramfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
{
int err;
@@ -50817,7 +50503,7 @@ diff -urNp linux-2.6.32.27/init/noinitramfs.c linux-2.6.32.27/init/noinitramfs.c
diff -urNp linux-2.6.32.27/ipc/ipc_sysctl.c linux-2.6.32.27/ipc/ipc_sysctl.c
--- linux-2.6.32.27/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/ipc/ipc_sysctl.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/ipc/ipc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
.extra1 = &zero,
.extra2 = &one,
@@ -50838,7 +50524,7 @@ diff -urNp linux-2.6.32.27/ipc/ipc_sysctl.c linux-2.6.32.27/ipc/ipc_sysctl.c
static int __init ipc_sysctl_init(void)
diff -urNp linux-2.6.32.27/ipc/mqueue.c linux-2.6.32.27/ipc/mqueue.c
--- linux-2.6.32.27/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/ipc/mqueue.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/ipc/mqueue.c 2010-12-31 14:46:53.000000000 -0500
@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
mq_bytes = (mq_msg_tblsz +
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -50849,7 +50535,7 @@ diff -urNp linux-2.6.32.27/ipc/mqueue.c linux-2.6.32.27/ipc/mqueue.c
u->mq_bytes + mq_bytes >
diff -urNp linux-2.6.32.27/ipc/shm.c linux-2.6.32.27/ipc/shm.c
--- linux-2.6.32.27/ipc/shm.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/ipc/shm.c 2010-12-09 18:45:13.000000000 -0500
++++ linux-2.6.32.27/ipc/shm.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif
@@ -50904,7 +50590,7 @@ diff -urNp linux-2.6.32.27/ipc/shm.c linux-2.6.32.27/ipc/shm.c
diff -urNp linux-2.6.32.27/kernel/acct.c linux-2.6.32.27/kernel/acct.c
--- linux-2.6.32.27/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/acct.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/acct.c 2010-12-31 14:46:53.000000000 -0500
@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -50916,7 +50602,7 @@ diff -urNp linux-2.6.32.27/kernel/acct.c linux-2.6.32.27/kernel/acct.c
set_fs(fs);
diff -urNp linux-2.6.32.27/kernel/audit.c linux-2.6.32.27/kernel/audit.c
--- linux-2.6.32.27/kernel/audit.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/audit.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/audit.c 2010-12-31 14:46:53.000000000 -0500
@@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_b
spin_unlock_irq(&tsk->sighand->siglock);
}
@@ -50932,8 +50618,8 @@ diff -urNp linux-2.6.32.27/kernel/audit.c linux-2.6.32.27/kernel/audit.c
case AUDIT_TTY_SET: {
diff -urNp linux-2.6.32.27/kernel/capability.c linux-2.6.32.27/kernel/capability.c
--- linux-2.6.32.27/kernel/capability.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/capability.c 2010-12-09 18:12:52.000000000 -0500
-@@ -306,10 +306,21 @@ int capable(int cap)
++++ linux-2.6.32.27/kernel/capability.c 2011-01-01 00:05:48.000000000 -0500
+@@ -306,10 +306,26 @@ int capable(int cap)
BUG();
}
@@ -50947,6 +50633,11 @@ diff -urNp linux-2.6.32.27/kernel/capability.c linux-2.6.32.27/kernel/capability
+
+int capable_nolog(int cap)
+{
++ if (unlikely(!cap_valid(cap))) {
++ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
++ BUG();
++ }
++
+ if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
+ current->flags |= PF_SUPERPRIV;
+ return 1;
@@ -50958,7 +50649,7 @@ diff -urNp linux-2.6.32.27/kernel/capability.c linux-2.6.32.27/kernel/capability
+EXPORT_SYMBOL(capable_nolog);
diff -urNp linux-2.6.32.27/kernel/configs.c linux-2.6.32.27/kernel/configs.c
--- linux-2.6.32.27/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/configs.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/configs.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
@@ -50981,7 +50672,7 @@ diff -urNp linux-2.6.32.27/kernel/configs.c linux-2.6.32.27/kernel/configs.c
diff -urNp linux-2.6.32.27/kernel/cpu.c linux-2.6.32.27/kernel/cpu.c
--- linux-2.6.32.27/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/kernel/cpu.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/cpu.c 2010-12-31 14:46:53.000000000 -0500
@@ -19,7 +19,7 @@
/* Serializes the updates to cpu_online_mask, cpu_present_mask */
static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -50993,7 +50684,7 @@ diff -urNp linux-2.6.32.27/kernel/cpu.c linux-2.6.32.27/kernel/cpu.c
* Should always be manipulated under cpu_add_remove_lock
diff -urNp linux-2.6.32.27/kernel/cred.c linux-2.6.32.27/kernel/cred.c
--- linux-2.6.32.27/kernel/cred.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/cred.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/cred.c 2010-12-31 14:46:53.000000000 -0500
@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
get_cred(new); /* we will require a ref for the subj creds too */
@@ -51005,7 +50696,7 @@ diff -urNp linux-2.6.32.27/kernel/cred.c linux-2.6.32.27/kernel/cred.c
old->egid != new->egid ||
diff -urNp linux-2.6.32.27/kernel/exit.c linux-2.6.32.27/kernel/exit.c
--- linux-2.6.32.27/kernel/exit.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/kernel/exit.c 2010-12-09 21:04:08.000000000 -0500
++++ linux-2.6.32.27/kernel/exit.c 2010-12-31 14:46:53.000000000 -0500
@@ -56,6 +56,10 @@
#include <asm/mmu_context.h>
#include "cred-internals.h"
@@ -51151,7 +50842,7 @@ diff -urNp linux-2.6.32.27/kernel/exit.c linux-2.6.32.27/kernel/exit.c
read_unlock(&tasklist_lock);
diff -urNp linux-2.6.32.27/kernel/fork.c linux-2.6.32.27/kernel/fork.c
--- linux-2.6.32.27/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/kernel/fork.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/fork.c 2010-12-31 14:46:53.000000000 -0500
@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
@@ -51292,7 +50983,7 @@ diff -urNp linux-2.6.32.27/kernel/fork.c linux-2.6.32.27/kernel/fork.c
new_fs = fs;
diff -urNp linux-2.6.32.27/kernel/futex.c linux-2.6.32.27/kernel/futex.c
--- linux-2.6.32.27/kernel/futex.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/kernel/futex.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/futex.c 2010-12-31 14:47:01.000000000 -0500
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
@@ -51358,9 +51049,28 @@ diff -urNp linux-2.6.32.27/kernel/futex.c linux-2.6.32.27/kernel/futex.c
{
unsigned long uentry;
+@@ -2640,6 +2653,7 @@ static int __init futex_init(void)
+ {
+ u32 curval;
+ int i;
++ mm_segment_t oldfs;
+
+ /*
+ * This will fail and we want it. Some arch implementations do
+@@ -2651,7 +2665,10 @@ static int __init futex_init(void)
+ * implementation, the non functional ones will return
+ * -ENOSYS.
+ */
++ oldfs = get_fs();
++ set_fs(USER_DS);
+ curval = cmpxchg_futex_value_locked(NULL, 0, 0);
++ set_fs(oldfs);
+ if (curval == -EFAULT)
+ futex_cmpxchg_enabled = 1;
+
diff -urNp linux-2.6.32.27/kernel/futex_compat.c linux-2.6.32.27/kernel/futex_compat.c
--- linux-2.6.32.27/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/futex_compat.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/futex_compat.c 2010-12-31 14:46:53.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
@@ -51400,7 +51110,7 @@ diff -urNp linux-2.6.32.27/kernel/futex_compat.c linux-2.6.32.27/kernel/futex_co
}
diff -urNp linux-2.6.32.27/kernel/gcov/base.c linux-2.6.32.27/kernel/gcov/base.c
--- linux-2.6.32.27/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/gcov/base.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/gcov/base.c 2010-12-31 14:46:53.000000000 -0500
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
@@ -51424,7 +51134,7 @@ diff -urNp linux-2.6.32.27/kernel/gcov/base.c linux-2.6.32.27/kernel/gcov/base.c
else
diff -urNp linux-2.6.32.27/kernel/hrtimer.c linux-2.6.32.27/kernel/hrtimer.c
--- linux-2.6.32.27/kernel/hrtimer.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/kernel/hrtimer.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/hrtimer.c 2010-12-31 14:46:53.000000000 -0500
@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
@@ -51436,7 +51146,7 @@ diff -urNp linux-2.6.32.27/kernel/hrtimer.c linux-2.6.32.27/kernel/hrtimer.c
}
diff -urNp linux-2.6.32.27/kernel/kallsyms.c linux-2.6.32.27/kernel/kallsyms.c
--- linux-2.6.32.27/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/kallsyms.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/kallsyms.c 2010-12-31 14:46:53.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)
@@ -51541,7 +51251,7 @@ diff -urNp linux-2.6.32.27/kernel/kallsyms.c linux-2.6.32.27/kernel/kallsyms.c
reset_iter(iter, 0);
diff -urNp linux-2.6.32.27/kernel/kgdb.c linux-2.6.32.27/kernel/kgdb.c
--- linux-2.6.32.27/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/kgdb.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
@@ -51571,7 +51281,7 @@ diff -urNp linux-2.6.32.27/kernel/kgdb.c linux-2.6.32.27/kernel/kgdb.c
diff -urNp linux-2.6.32.27/kernel/kmod.c linux-2.6.32.27/kernel/kmod.c
--- linux-2.6.32.27/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/kmod.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/kmod.c 2010-12-31 14:46:53.000000000 -0500
@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
if (ret >= MODULE_NAME_LEN)
return -ENAMETOOLONG;
@@ -51593,7 +51303,7 @@ diff -urNp linux-2.6.32.27/kernel/kmod.c linux-2.6.32.27/kernel/kmod.c
* MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
diff -urNp linux-2.6.32.27/kernel/kprobes.c linux-2.6.32.27/kernel/kprobes.c
--- linux-2.6.32.27/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/kprobes.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/kprobes.c 2010-12-31 14:46:53.000000000 -0500
@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
* kernel image and loaded module images reside. This is required
* so x86_64 can correctly handle the %rip-relative fixups.
@@ -51632,7 +51342,7 @@ diff -urNp linux-2.6.32.27/kernel/kprobes.c linux-2.6.32.27/kernel/kprobes.c
preempt_disable();
diff -urNp linux-2.6.32.27/kernel/lockdep.c linux-2.6.32.27/kernel/lockdep.c
--- linux-2.6.32.27/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/lockdep.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/lockdep.c 2010-12-31 14:46:53.000000000 -0500
@@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t
/*
* Various lockdep statistics:
@@ -51708,7 +51418,7 @@ diff -urNp linux-2.6.32.27/kernel/lockdep.c linux-2.6.32.27/kernel/lockdep.c
if (class->name_version > 1)
diff -urNp linux-2.6.32.27/kernel/lockdep_internals.h linux-2.6.32.27/kernel/lockdep_internals.h
--- linux-2.6.32.27/kernel/lockdep_internals.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/lockdep_internals.h 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/lockdep_internals.h 2010-12-31 14:46:53.000000000 -0500
@@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_
/*
* Various lockdep statistics:
@@ -51758,7 +51468,7 @@ diff -urNp linux-2.6.32.27/kernel/lockdep_internals.h linux-2.6.32.27/kernel/loc
# define debug_atomic_dec(ptr) do { } while (0)
diff -urNp linux-2.6.32.27/kernel/lockdep_proc.c linux-2.6.32.27/kernel/lockdep_proc.c
--- linux-2.6.32.27/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/lockdep_proc.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/lockdep_proc.c 2010-12-31 14:46:53.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)
@@ -51770,7 +51480,7 @@ diff -urNp linux-2.6.32.27/kernel/lockdep_proc.c linux-2.6.32.27/kernel/lockdep_
if (!name) {
diff -urNp linux-2.6.32.27/kernel/module.c linux-2.6.32.27/kernel/module.c
--- linux-2.6.32.27/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/module.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
static BLOCKING_NOTIFIER_HEAD(module_notify_list);
@@ -52316,7 +52026,7 @@ diff -urNp linux-2.6.32.27/kernel/module.c linux-2.6.32.27/kernel/module.c
return mod;
diff -urNp linux-2.6.32.27/kernel/panic.c linux-2.6.32.27/kernel/panic.c
--- linux-2.6.32.27/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/panic.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/panic.c 2010-12-31 14:46:53.000000000 -0500
@@ -352,7 +352,7 @@ static void warn_slowpath_common(const c
const char *board;
@@ -52338,7 +52048,7 @@ diff -urNp linux-2.6.32.27/kernel/panic.c linux-2.6.32.27/kernel/panic.c
EXPORT_SYMBOL(__stack_chk_fail);
diff -urNp linux-2.6.32.27/kernel/params.c linux-2.6.32.27/kernel/params.c
--- linux-2.6.32.27/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/params.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/params.c 2010-12-31 14:46:53.000000000 -0500
@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
return ret;
}
@@ -52359,7 +52069,7 @@ diff -urNp linux-2.6.32.27/kernel/params.c linux-2.6.32.27/kernel/params.c
diff -urNp linux-2.6.32.27/kernel/pid.c linux-2.6.32.27/kernel/pid.c
--- linux-2.6.32.27/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/pid.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/pid.c 2010-12-31 14:46:53.000000000 -0500
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
@@ -52395,7 +52105,7 @@ diff -urNp linux-2.6.32.27/kernel/pid.c linux-2.6.32.27/kernel/pid.c
struct task_struct *find_task_by_vpid(pid_t vnr)
diff -urNp linux-2.6.32.27/kernel/posix-cpu-timers.c linux-2.6.32.27/kernel/posix-cpu-timers.c
--- linux-2.6.32.27/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/posix-cpu-timers.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/posix-cpu-timers.c 2010-12-31 14:46:53.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
@@ -52404,9 +52114,29 @@ diff -urNp linux-2.6.32.27/kernel/posix-cpu-timers.c linux-2.6.32.27/kernel/posi
#include <asm/uaccess.h>
#include <linux/kernel_stat.h>
#include <trace/events/timer.h>
+diff -urNp linux-2.6.32.27/kernel/posix-timers.c linux-2.6.32.27/kernel/posix-timers.c
+--- linux-2.6.32.27/kernel/posix-timers.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/kernel/posix-timers.c 2011-01-01 00:09:34.000000000 -0500
+@@ -42,6 +42,7 @@
+ #include <linux/compiler.h>
+ #include <linux/idr.h>
+ #include <linux/posix-timers.h>
++#include <linux/grsecurity.h>
+ #include <linux/syscalls.h>
+ #include <linux/wait.h>
+ #include <linux/workqueue.h>
+@@ -948,6 +949,8 @@ SYSCALL_DEFINE2(clock_settime, const clo
+ if (copy_from_user(&new_tp, tp, sizeof (*tp)))
+ return -EFAULT;
+
++ gr_log_timechange();
++
+ return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
+ }
+
diff -urNp linux-2.6.32.27/kernel/power/hibernate.c linux-2.6.32.27/kernel/power/hibernate.c
--- linux-2.6.32.27/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/power/hibernate.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/power/hibernate.c 2010-12-31 14:46:53.000000000 -0500
@@ -48,14 +48,14 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -52426,7 +52156,7 @@ diff -urNp linux-2.6.32.27/kernel/power/hibernate.c linux-2.6.32.27/kernel/power
&& ops->prepare && ops->finish && ops->enter && ops->pre_restore
diff -urNp linux-2.6.32.27/kernel/power/poweroff.c linux-2.6.32.27/kernel/power/poweroff.c
--- linux-2.6.32.27/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/power/poweroff.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/power/poweroff.c 2010-12-31 14:46:53.000000000 -0500
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
@@ -52438,7 +52168,7 @@ diff -urNp linux-2.6.32.27/kernel/power/poweroff.c linux-2.6.32.27/kernel/power/
return 0;
diff -urNp linux-2.6.32.27/kernel/power/process.c linux-2.6.32.27/kernel/power/process.c
--- linux-2.6.32.27/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/power/process.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/power/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
struct timeval start, end;
u64 elapsed_csecs64;
@@ -52480,7 +52210,7 @@ diff -urNp linux-2.6.32.27/kernel/power/process.c linux-2.6.32.27/kernel/power/p
elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
diff -urNp linux-2.6.32.27/kernel/power/suspend.c linux-2.6.32.27/kernel/power/suspend.c
--- linux-2.6.32.27/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/power/suspend.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/power/suspend.c 2010-12-31 14:46:53.000000000 -0500
@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
[PM_SUSPEND_MEM] = "mem",
};
@@ -52499,7 +52229,7 @@ diff -urNp linux-2.6.32.27/kernel/power/suspend.c linux-2.6.32.27/kernel/power/s
suspend_ops = ops;
diff -urNp linux-2.6.32.27/kernel/printk.c linux-2.6.32.27/kernel/printk.c
--- linux-2.6.32.27/kernel/printk.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/printk.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/printk.c 2010-12-31 14:46:53.000000000 -0500
@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
char c;
int error = 0;
@@ -52514,7 +52244,7 @@ diff -urNp linux-2.6.32.27/kernel/printk.c linux-2.6.32.27/kernel/printk.c
return error;
diff -urNp linux-2.6.32.27/kernel/ptrace.c linux-2.6.32.27/kernel/ptrace.c
--- linux-2.6.32.27/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/ptrace.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/ptrace.c 2011-01-01 00:19:08.000000000 -0500
@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
cred->gid != tcred->egid ||
cred->gid != tcred->sgid ||
@@ -52596,9 +52326,32 @@ diff -urNp linux-2.6.32.27/kernel/ptrace.c linux-2.6.32.27/kernel/ptrace.c
}
int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
+@@ -740,14 +747,21 @@ asmlinkage long compat_sys_ptrace(compat
+ goto out;
+ }
+
++ if (gr_handle_ptrace(child, request)) {
++ ret = -EPERM;
++ goto out_put_task_struct;
++ }
++
+ if (request == PTRACE_ATTACH) {
+ ret = ptrace_attach(child);
+ /*
+ * Some architectures need to do book-keeping after
+ * a ptrace attach.
+ */
+- if (!ret)
++ if (!ret) {
+ arch_ptrace_attach(child);
++ gr_audit_ptrace(child);
++ }
+ goto out_put_task_struct;
+ }
+
diff -urNp linux-2.6.32.27/kernel/rcutree.c linux-2.6.32.27/kernel/rcutree.c
--- linux-2.6.32.27/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/rcutree.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/rcutree.c 2010-12-31 14:46:53.000000000 -0500
@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
/*
* Do softirq processing for the current CPU.
@@ -52608,9 +52361,30 @@ diff -urNp linux-2.6.32.27/kernel/rcutree.c linux-2.6.32.27/kernel/rcutree.c
{
/*
* Memory references from any prior RCU read-side critical sections
+diff -urNp linux-2.6.32.27/kernel/rcutree_plugin.h linux-2.6.32.27/kernel/rcutree_plugin.h
+--- linux-2.6.32.27/kernel/rcutree_plugin.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/kernel/rcutree_plugin.h 2010-12-31 14:47:01.000000000 -0500
+@@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi
+ */
+ void __rcu_read_lock(void)
+ {
+- ACCESS_ONCE(current->rcu_read_lock_nesting)++;
++ ACCESS_ONCE_RW(current->rcu_read_lock_nesting)++;
+ barrier(); /* needed if we ever invoke rcu_read_lock in rcutree.c */
+ }
+ EXPORT_SYMBOL_GPL(__rcu_read_lock);
+@@ -251,7 +251,7 @@ void __rcu_read_unlock(void)
+ struct task_struct *t = current;
+
+ barrier(); /* needed if we ever invoke rcu_read_unlock in rcutree.c */
+- if (--ACCESS_ONCE(t->rcu_read_lock_nesting) == 0 &&
++ if (--ACCESS_ONCE_RW(t->rcu_read_lock_nesting) == 0 &&
+ unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
+ rcu_read_unlock_special(t);
+ }
diff -urNp linux-2.6.32.27/kernel/relay.c linux-2.6.32.27/kernel/relay.c
--- linux-2.6.32.27/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/relay.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/relay.c 2010-12-31 14:46:53.000000000 -0500
@@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
unsigned int flags,
int *nonpad_ret)
@@ -52630,7 +52404,7 @@ diff -urNp linux-2.6.32.27/kernel/relay.c linux-2.6.32.27/kernel/relay.c
return 0;
diff -urNp linux-2.6.32.27/kernel/resource.c linux-2.6.32.27/kernel/resource.c
--- linux-2.6.32.27/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/resource.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/resource.c 2010-12-31 14:46:53.000000000 -0500
@@ -132,8 +132,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
@@ -52652,7 +52426,7 @@ diff -urNp linux-2.6.32.27/kernel/resource.c linux-2.6.32.27/kernel/resource.c
__initcall(ioresources_init);
diff -urNp linux-2.6.32.27/kernel/rtmutex.c linux-2.6.32.27/kernel/rtmutex.c
--- linux-2.6.32.27/kernel/rtmutex.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/rtmutex.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/rtmutex.c 2010-12-31 14:46:53.000000000 -0500
@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
*/
spin_lock_irqsave(&pendowner->pi_lock, flags);
@@ -52664,7 +52438,7 @@ diff -urNp linux-2.6.32.27/kernel/rtmutex.c linux-2.6.32.27/kernel/rtmutex.c
diff -urNp linux-2.6.32.27/kernel/sched.c linux-2.6.32.27/kernel/sched.c
--- linux-2.6.32.27/kernel/sched.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/kernel/sched.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/sched.c 2010-12-31 14:46:53.000000000 -0500
@@ -4904,7 +4904,7 @@ out:
* In CONFIG_NO_HZ case, the idle load balance owner will do the
* rebalancing for all the cpus for whom scheduler ticks are stopped.
@@ -52722,7 +52496,7 @@ diff -urNp linux-2.6.32.27/kernel/sched.c linux-2.6.32.27/kernel/sched.c
return;
diff -urNp linux-2.6.32.27/kernel/signal.c linux-2.6.32.27/kernel/signal.c
--- linux-2.6.32.27/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/signal.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/signal.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,12 +41,12 @@
static struct kmem_cache *sigqueue_cachep;
@@ -52810,7 +52584,7 @@ diff -urNp linux-2.6.32.27/kernel/signal.c linux-2.6.32.27/kernel/signal.c
}
diff -urNp linux-2.6.32.27/kernel/smp.c linux-2.6.32.27/kernel/smp.c
--- linux-2.6.32.27/kernel/smp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/smp.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/smp.c 2010-12-31 14:46:53.000000000 -0500
@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
}
EXPORT_SYMBOL(smp_call_function);
@@ -52840,7 +52614,7 @@ diff -urNp linux-2.6.32.27/kernel/smp.c linux-2.6.32.27/kernel/smp.c
}
diff -urNp linux-2.6.32.27/kernel/softirq.c linux-2.6.32.27/kernel/softirq.c
--- linux-2.6.32.27/kernel/softirq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/softirq.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/softirq.c 2010-12-31 14:46:53.000000000 -0500
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -52897,7 +52671,7 @@ diff -urNp linux-2.6.32.27/kernel/softirq.c linux-2.6.32.27/kernel/softirq.c
diff -urNp linux-2.6.32.27/kernel/sys.c linux-2.6.32.27/kernel/sys.c
--- linux-2.6.32.27/kernel/sys.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/kernel/sys.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/sys.c 2010-12-31 14:46:53.000000000 -0500
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
@@ -53035,7 +52809,7 @@ diff -urNp linux-2.6.32.27/kernel/sys.c linux-2.6.32.27/kernel/sys.c
}
diff -urNp linux-2.6.32.27/kernel/sysctl.c linux-2.6.32.27/kernel/sysctl.c
--- linux-2.6.32.27/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/sysctl.c 2010-12-09 19:48:18.000000000 -0500
++++ linux-2.6.32.27/kernel/sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,6 +63,13 @@
static int deprecated_sysctl_warning(struct __sysctl_args *args);
@@ -53269,7 +53043,7 @@ diff -urNp linux-2.6.32.27/kernel/sysctl.c linux-2.6.32.27/kernel/sysctl.c
EXPORT_SYMBOL(unregister_sysctl_table);
diff -urNp linux-2.6.32.27/kernel/sysctl_check.c linux-2.6.32.27/kernel/sysctl_check.c
--- linux-2.6.32.27/kernel/sysctl_check.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/sysctl_check.c 2010-12-09 20:10:32.000000000 -0500
++++ linux-2.6.32.27/kernel/sysctl_check.c 2010-12-31 14:46:53.000000000 -0500
@@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n
} else {
if ((table->strategy == sysctl_data) ||
@@ -53285,7 +53059,7 @@ diff -urNp linux-2.6.32.27/kernel/sysctl_check.c linux-2.6.32.27/kernel/sysctl_c
(table->proc_handler == proc_dointvec_jiffies) ||
diff -urNp linux-2.6.32.27/kernel/taskstats.c linux-2.6.32.27/kernel/taskstats.c
--- linux-2.6.32.27/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/taskstats.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/taskstats.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,9 +26,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
@@ -53311,7 +53085,7 @@ diff -urNp linux-2.6.32.27/kernel/taskstats.c linux-2.6.32.27/kernel/taskstats.c
diff -urNp linux-2.6.32.27/kernel/time/tick-broadcast.c linux-2.6.32.27/kernel/time/tick-broadcast.c
--- linux-2.6.32.27/kernel/time/tick-broadcast.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/time/tick-broadcast.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/time/tick-broadcast.c 2010-12-31 14:46:53.000000000 -0500
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
@@ -53321,9 +53095,29 @@ diff -urNp linux-2.6.32.27/kernel/time/tick-broadcast.c linux-2.6.32.27/kernel/t
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
+diff -urNp linux-2.6.32.27/kernel/time/timekeeping.c linux-2.6.32.27/kernel/time/timekeeping.c
+--- linux-2.6.32.27/kernel/time/timekeeping.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/kernel/time/timekeeping.c 2011-01-01 00:15:19.000000000 -0500
+@@ -14,6 +14,7 @@
+ #include <linux/init.h>
+ #include <linux/mm.h>
+ #include <linux/sched.h>
++#include <linux/grsecurity.h>
+ #include <linux/sysdev.h>
+ #include <linux/clocksource.h>
+ #include <linux/jiffies.h>
+@@ -322,6 +323,8 @@ int do_settimeofday(struct timespec *tv)
+ if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
+ return -EINVAL;
+
++ gr_log_timechange();
++
+ write_seqlock_irqsave(&xtime_lock, flags);
+
+ timekeeping_forward_now();
diff -urNp linux-2.6.32.27/kernel/time/timer_list.c linux-2.6.32.27/kernel/time/timer_list.c
--- linux-2.6.32.27/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/time/timer_list.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/time/timer_list.c 2010-12-31 14:46:53.000000000 -0500
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
static void print_name_offset(struct seq_file *m, void *sym)
@@ -53367,7 +53161,7 @@ diff -urNp linux-2.6.32.27/kernel/time/timer_list.c linux-2.6.32.27/kernel/time/
return 0;
diff -urNp linux-2.6.32.27/kernel/time/timer_stats.c linux-2.6.32.27/kernel/time/timer_stats.c
--- linux-2.6.32.27/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/time/timer_stats.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/time/timer_stats.c 2010-12-31 14:46:53.000000000 -0500
@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
static void print_name_offset(struct seq_file *m, unsigned long addr)
@@ -53399,27 +53193,17 @@ diff -urNp linux-2.6.32.27/kernel/time/timer_stats.c linux-2.6.32.27/kernel/time
return 0;
diff -urNp linux-2.6.32.27/kernel/time.c linux-2.6.32.27/kernel/time.c
--- linux-2.6.32.27/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/time.c 2010-12-09 18:12:52.000000000 -0500
-@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
- return err;
-
- do_settimeofday(&tv);
-+
-+ gr_log_timechange();
-+
- return 0;
- }
-
-@@ -202,6 +205,8 @@ SYSCALL_DEFINE2(settimeofday, struct tim
- return -EFAULT;
- }
++++ linux-2.6.32.27/kernel/time.c 2011-01-01 02:01:24.000000000 -0500
+@@ -160,6 +160,8 @@ int do_sys_settimeofday(struct timespec
+ if (tv && !timespec_valid(tv))
+ return -EINVAL;
+ gr_log_timechange();
+
- return do_sys_settimeofday(tv ? &new_ts : NULL, tz ? &new_tz : NULL);
- }
-
-@@ -240,7 +245,7 @@ EXPORT_SYMBOL(current_fs_time);
+ error = security_settime(tv, tz);
+ if (error)
+ return error;
+@@ -240,7 +242,7 @@ EXPORT_SYMBOL(current_fs_time);
* Avoid unnecessary multiplications/divisions in the
* two most common HZ cases:
*/
@@ -53428,7 +53212,7 @@ diff -urNp linux-2.6.32.27/kernel/time.c linux-2.6.32.27/kernel/time.c
{
#if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
return (MSEC_PER_SEC / HZ) * j;
-@@ -256,7 +261,7 @@ unsigned int inline jiffies_to_msecs(con
+@@ -256,7 +258,7 @@ unsigned int inline jiffies_to_msecs(con
}
EXPORT_SYMBOL(jiffies_to_msecs);
@@ -53439,7 +53223,7 @@ diff -urNp linux-2.6.32.27/kernel/time.c linux-2.6.32.27/kernel/time.c
return (USEC_PER_SEC / HZ) * j;
diff -urNp linux-2.6.32.27/kernel/timer.c linux-2.6.32.27/kernel/timer.c
--- linux-2.6.32.27/kernel/timer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/timer.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/timer.c 2010-12-31 14:46:53.000000000 -0500
@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
@@ -53451,7 +53235,7 @@ diff -urNp linux-2.6.32.27/kernel/timer.c linux-2.6.32.27/kernel/timer.c
diff -urNp linux-2.6.32.27/kernel/trace/ftrace.c linux-2.6.32.27/kernel/trace/ftrace.c
--- linux-2.6.32.27/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.27/kernel/trace/ftrace.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/trace/ftrace.c 2010-12-31 14:46:53.000000000 -0500
@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
@@ -53475,7 +53259,7 @@ diff -urNp linux-2.6.32.27/kernel/trace/ftrace.c linux-2.6.32.27/kernel/trace/ft
/*
diff -urNp linux-2.6.32.27/kernel/trace/ring_buffer.c linux-2.6.32.27/kernel/trace/ring_buffer.c
--- linux-2.6.32.27/kernel/trace/ring_buffer.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/kernel/trace/ring_buffer.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/trace/ring_buffer.c 2010-12-31 14:46:53.000000000 -0500
@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
* the reader page). But if the next page is a header page,
* its flags will be non zero.
@@ -53487,7 +53271,7 @@ diff -urNp linux-2.6.32.27/kernel/trace/ring_buffer.c linux-2.6.32.27/kernel/tra
{
diff -urNp linux-2.6.32.27/kernel/trace/trace.c linux-2.6.32.27/kernel/trace/trace.c
--- linux-2.6.32.27/kernel/trace/trace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/trace/trace.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/trace/trace.c 2010-12-31 14:46:53.000000000 -0500
@@ -3808,10 +3808,9 @@ static const struct file_operations trac
};
#endif
@@ -53514,7 +53298,7 @@ diff -urNp linux-2.6.32.27/kernel/trace/trace.c linux-2.6.32.27/kernel/trace/tra
diff -urNp linux-2.6.32.27/kernel/trace/trace_events.c linux-2.6.32.27/kernel/trace/trace_events.c
--- linux-2.6.32.27/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/trace/trace_events.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/trace/trace_events.c 2010-12-31 14:46:53.000000000 -0500
@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
* Modules must own their file_operations to keep up with
* reference counting.
@@ -53526,7 +53310,7 @@ diff -urNp linux-2.6.32.27/kernel/trace/trace_events.c linux-2.6.32.27/kernel/tr
struct module *mod;
diff -urNp linux-2.6.32.27/kernel/trace/trace_output.c linux-2.6.32.27/kernel/trace/trace_output.c
--- linux-2.6.32.27/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/trace/trace_output.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/trace/trace_output.c 2010-12-31 14:46:53.000000000 -0500
@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
return 0;
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -53538,7 +53322,7 @@ diff -urNp linux-2.6.32.27/kernel/trace/trace_output.c linux-2.6.32.27/kernel/tr
return 1;
diff -urNp linux-2.6.32.27/kernel/trace/trace_stack.c linux-2.6.32.27/kernel/trace/trace_stack.c
--- linux-2.6.32.27/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/trace/trace_stack.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/trace/trace_stack.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
@@ -53548,9 +53332,20 @@ diff -urNp linux-2.6.32.27/kernel/trace/trace_stack.c linux-2.6.32.27/kernel/tra
return;
local_irq_save(flags);
+diff -urNp linux-2.6.32.27/kernel/user.c linux-2.6.32.27/kernel/user.c
+--- linux-2.6.32.27/kernel/user.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/kernel/user.c 2010-12-31 15:09:34.000000000 -0500
+@@ -465,6 +465,7 @@ struct user_struct *alloc_uid(struct use
+ * uids_mutex. Hence no need to call
+ * sched_destroy_user() or remove_user_sysfs_dir().
+ */
++ put_user_ns(ns);
+ key_put(new->uid_keyring);
+ key_put(new->session_keyring);
+ kmem_cache_free(uid_cachep, new);
diff -urNp linux-2.6.32.27/kernel/utsname_sysctl.c linux-2.6.32.27/kernel/utsname_sysctl.c
--- linux-2.6.32.27/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/kernel/utsname_sysctl.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/kernel/utsname_sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
.proc_handler = proc_do_uts_string,
.strategy = sysctl_uts_string,
@@ -53571,7 +53366,7 @@ diff -urNp linux-2.6.32.27/kernel/utsname_sysctl.c linux-2.6.32.27/kernel/utsnam
static int __init utsname_sysctl_init(void)
diff -urNp linux-2.6.32.27/lib/bug.c linux-2.6.32.27/lib/bug.c
--- linux-2.6.32.27/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/bug.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/bug.c 2010-12-31 14:46:53.000000000 -0500
@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
@@ -53583,7 +53378,7 @@ diff -urNp linux-2.6.32.27/lib/bug.c linux-2.6.32.27/lib/bug.c
diff -urNp linux-2.6.32.27/lib/debugobjects.c linux-2.6.32.27/lib/debugobjects.c
--- linux-2.6.32.27/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/debugobjects.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/debugobjects.c 2010-12-31 14:46:53.000000000 -0500
@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
@@ -53595,7 +53390,7 @@ diff -urNp linux-2.6.32.27/lib/debugobjects.c linux-2.6.32.27/lib/debugobjects.c
diff -urNp linux-2.6.32.27/lib/dma-debug.c linux-2.6.32.27/lib/dma-debug.c
--- linux-2.6.32.27/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/dma-debug.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/dma-debug.c 2010-12-31 14:46:53.000000000 -0500
@@ -861,7 +861,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
@@ -53607,7 +53402,7 @@ diff -urNp linux-2.6.32.27/lib/dma-debug.c linux-2.6.32.27/lib/dma-debug.c
}
diff -urNp linux-2.6.32.27/lib/idr.c linux-2.6.32.27/lib/idr.c
--- linux-2.6.32.27/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/idr.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/idr.c 2010-12-31 14:46:53.000000000 -0500
@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
@@ -53619,7 +53414,7 @@ diff -urNp linux-2.6.32.27/lib/idr.c linux-2.6.32.27/lib/idr.c
}
diff -urNp linux-2.6.32.27/lib/inflate.c linux-2.6.32.27/lib/inflate.c
--- linux-2.6.32.27/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/inflate.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/inflate.c 2010-12-31 14:46:53.000000000 -0500
@@ -266,7 +266,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
@@ -53631,7 +53426,7 @@ diff -urNp linux-2.6.32.27/lib/inflate.c linux-2.6.32.27/lib/inflate.c
diff -urNp linux-2.6.32.27/lib/Kconfig.debug linux-2.6.32.27/lib/Kconfig.debug
--- linux-2.6.32.27/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/Kconfig.debug 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
@@ -905,7 +905,7 @@ config LATENCYTOP
select STACKTRACE
select SCHEDSTATS
@@ -53643,7 +53438,7 @@ diff -urNp linux-2.6.32.27/lib/Kconfig.debug linux-2.6.32.27/lib/Kconfig.debug
to find out which userspace is blocking on what kernel operations.
diff -urNp linux-2.6.32.27/lib/kobject.c linux-2.6.32.27/lib/kobject.c
--- linux-2.6.32.27/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/kobject.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/kobject.c 2010-12-31 14:46:53.000000000 -0500
@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
return ret;
}
@@ -53673,7 +53468,7 @@ diff -urNp linux-2.6.32.27/lib/kobject.c linux-2.6.32.27/lib/kobject.c
struct kset *kset;
diff -urNp linux-2.6.32.27/lib/kobject_uevent.c linux-2.6.32.27/lib/kobject_uevent.c
--- linux-2.6.32.27/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/kobject_uevent.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/kobject_uevent.c 2010-12-31 14:46:53.000000000 -0500
@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
const char *subsystem;
struct kobject *top_kobj;
@@ -53685,7 +53480,7 @@ diff -urNp linux-2.6.32.27/lib/kobject_uevent.c linux-2.6.32.27/lib/kobject_ueve
int retval = 0;
diff -urNp linux-2.6.32.27/lib/kref.c linux-2.6.32.27/lib/kref.c
--- linux-2.6.32.27/lib/kref.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/kref.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/kref.c 2010-12-31 14:46:53.000000000 -0500
@@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
*/
int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -53697,7 +53492,7 @@ diff -urNp linux-2.6.32.27/lib/kref.c linux-2.6.32.27/lib/kref.c
if (atomic_dec_and_test(&kref->refcount)) {
diff -urNp linux-2.6.32.27/lib/parser.c linux-2.6.32.27/lib/parser.c
--- linux-2.6.32.27/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/parser.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/parser.c 2010-12-31 14:46:53.000000000 -0500
@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
char *buf;
int ret;
@@ -53709,7 +53504,7 @@ diff -urNp linux-2.6.32.27/lib/parser.c linux-2.6.32.27/lib/parser.c
memcpy(buf, s->from, s->to - s->from);
diff -urNp linux-2.6.32.27/lib/radix-tree.c linux-2.6.32.27/lib/radix-tree.c
--- linux-2.6.32.27/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/radix-tree.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/radix-tree.c 2010-12-31 14:46:53.000000000 -0500
@@ -81,7 +81,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -53721,7 +53516,7 @@ diff -urNp linux-2.6.32.27/lib/radix-tree.c linux-2.6.32.27/lib/radix-tree.c
{
diff -urNp linux-2.6.32.27/lib/random32.c linux-2.6.32.27/lib/random32.c
--- linux-2.6.32.27/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/random32.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/random32.c 2010-12-31 14:46:53.000000000 -0500
@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
*/
static inline u32 __seed(u32 x, u32 m)
@@ -53733,7 +53528,7 @@ diff -urNp linux-2.6.32.27/lib/random32.c linux-2.6.32.27/lib/random32.c
/**
diff -urNp linux-2.6.32.27/lib/vsprintf.c linux-2.6.32.27/lib/vsprintf.c
--- linux-2.6.32.27/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/lib/vsprintf.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/lib/vsprintf.c 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,9 @@
* - scnprintf and vscnprintf
*/
@@ -53836,12 +53631,12 @@ diff -urNp linux-2.6.32.27/lib/vsprintf.c linux-2.6.32.27/lib/vsprintf.c
diff -urNp linux-2.6.32.27/localversion-grsec linux-2.6.32.27/localversion-grsec
--- linux-2.6.32.27/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/localversion-grsec 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/localversion-grsec 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1 @@
+-grsec
diff -urNp linux-2.6.32.27/Makefile linux-2.6.32.27/Makefile
--- linux-2.6.32.27/Makefile 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/Makefile 2010-12-09 18:30:30.000000000 -0500
++++ linux-2.6.32.27/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
@@ -53864,7 +53659,7 @@ diff -urNp linux-2.6.32.27/Makefile linux-2.6.32.27/Makefile
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
diff -urNp linux-2.6.32.27/mm/filemap.c linux-2.6.32.27/mm/filemap.c
--- linux-2.6.32.27/mm/filemap.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/mm/filemap.c 2010-12-09 18:30:44.000000000 -0500
++++ linux-2.6.32.27/mm/filemap.c 2010-12-31 14:46:53.000000000 -0500
@@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
@@ -53884,7 +53679,7 @@ diff -urNp linux-2.6.32.27/mm/filemap.c linux-2.6.32.27/mm/filemap.c
return -EFBIG;
diff -urNp linux-2.6.32.27/mm/fremap.c linux-2.6.32.27/mm/fremap.c
--- linux-2.6.32.27/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/fremap.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/fremap.c 2010-12-31 14:46:53.000000000 -0500
@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
@@ -53908,7 +53703,7 @@ diff -urNp linux-2.6.32.27/mm/fremap.c linux-2.6.32.27/mm/fremap.c
}
diff -urNp linux-2.6.32.27/mm/highmem.c linux-2.6.32.27/mm/highmem.c
--- linux-2.6.32.27/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/highmem.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/highmem.c 2010-12-31 14:46:53.000000000 -0500
@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
@@ -53936,7 +53731,7 @@ diff -urNp linux-2.6.32.27/mm/highmem.c linux-2.6.32.27/mm/highmem.c
diff -urNp linux-2.6.32.27/mm/hugetlb.c linux-2.6.32.27/mm/hugetlb.c
--- linux-2.6.32.27/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/hugetlb.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/hugetlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
return 1;
}
@@ -54018,7 +53813,7 @@ diff -urNp linux-2.6.32.27/mm/hugetlb.c linux-2.6.32.27/mm/hugetlb.c
return VM_FAULT_OOM;
diff -urNp linux-2.6.32.27/mm/Kconfig linux-2.6.32.27/mm/Kconfig
--- linux-2.6.32.27/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/Kconfig 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -228,7 +228,7 @@ config KSM
config DEFAULT_MMAP_MIN_ADDR
int "Low address space to protect from user allocation"
@@ -54030,7 +53825,7 @@ diff -urNp linux-2.6.32.27/mm/Kconfig linux-2.6.32.27/mm/Kconfig
from userspace allocation. Keeping a user from writing to low pages
diff -urNp linux-2.6.32.27/mm/kmemleak.c linux-2.6.32.27/mm/kmemleak.c
--- linux-2.6.32.27/mm/kmemleak.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/kmemleak.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/kmemleak.c 2010-12-31 14:46:53.000000000 -0500
@@ -358,7 +358,7 @@ static void print_unreferenced(struct se
for (i = 0; i < object->trace_len; i++) {
@@ -54042,7 +53837,7 @@ diff -urNp linux-2.6.32.27/mm/kmemleak.c linux-2.6.32.27/mm/kmemleak.c
diff -urNp linux-2.6.32.27/mm/maccess.c linux-2.6.32.27/mm/maccess.c
--- linux-2.6.32.27/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/maccess.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/maccess.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,7 +14,7 @@
* Safely read from address @src to the buffer at @dst. If a kernel fault
* happens, handle that and return -EFAULT.
@@ -54063,7 +53858,7 @@ diff -urNp linux-2.6.32.27/mm/maccess.c linux-2.6.32.27/mm/maccess.c
mm_segment_t old_fs = get_fs();
diff -urNp linux-2.6.32.27/mm/madvise.c linux-2.6.32.27/mm/madvise.c
--- linux-2.6.32.27/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/madvise.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/madvise.c 2010-12-31 14:46:53.000000000 -0500
@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
@@ -54142,7 +53937,7 @@ diff -urNp linux-2.6.32.27/mm/madvise.c linux-2.6.32.27/mm/madvise.c
goto out;
diff -urNp linux-2.6.32.27/mm/memory.c linux-2.6.32.27/mm/memory.c
--- linux-2.6.32.27/mm/memory.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/mm/memory.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/memory.c 2010-12-31 14:46:53.000000000 -0500
@@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
return;
@@ -54674,7 +54469,7 @@ diff -urNp linux-2.6.32.27/mm/memory.c linux-2.6.32.27/mm/memory.c
* Dumping its contents makes post-mortem fully interpretable later
diff -urNp linux-2.6.32.27/mm/memory-failure.c linux-2.6.32.27/mm/memory-failure.c
--- linux-2.6.32.27/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/memory-failure.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/memory-failure.c 2010-12-31 14:46:53.000000000 -0500
@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -54695,7 +54490,7 @@ diff -urNp linux-2.6.32.27/mm/memory-failure.c linux-2.6.32.27/mm/memory-failure
* We need/can do nothing about count=0 pages.
diff -urNp linux-2.6.32.27/mm/mempolicy.c linux-2.6.32.27/mm/mempolicy.c
--- linux-2.6.32.27/mm/mempolicy.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/mm/mempolicy.c 2010-12-09 18:30:44.000000000 -0500
++++ linux-2.6.32.27/mm/mempolicy.c 2010-12-31 14:46:53.000000000 -0500
@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
struct vm_area_struct *next;
int err;
@@ -54778,7 +54573,7 @@ diff -urNp linux-2.6.32.27/mm/mempolicy.c linux-2.6.32.27/mm/mempolicy.c
} else if (vma->vm_start <= mm->start_stack &&
diff -urNp linux-2.6.32.27/mm/migrate.c linux-2.6.32.27/mm/migrate.c
--- linux-2.6.32.27/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/migrate.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/migrate.c 2010-12-31 14:46:53.000000000 -0500
@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
if (!mm)
return -EINVAL;
@@ -54806,7 +54601,7 @@ diff -urNp linux-2.6.32.27/mm/migrate.c linux-2.6.32.27/mm/migrate.c
goto out;
diff -urNp linux-2.6.32.27/mm/mlock.c linux-2.6.32.27/mm/mlock.c
--- linux-2.6.32.27/mm/mlock.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/mm/mlock.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/mlock.c 2010-12-31 14:46:53.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
@@ -54910,7 +54705,7 @@ diff -urNp linux-2.6.32.27/mm/mlock.c linux-2.6.32.27/mm/mlock.c
ret = do_mlockall(flags);
diff -urNp linux-2.6.32.27/mm/mmap.c linux-2.6.32.27/mm/mmap.c
--- linux-2.6.32.27/mm/mmap.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/mm/mmap.c 2010-12-15 18:01:42.000000000 -0500
++++ linux-2.6.32.27/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -45,6 +45,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -56132,7 +55927,7 @@ diff -urNp linux-2.6.32.27/mm/mmap.c linux-2.6.32.27/mm/mmap.c
static DEFINE_MUTEX(mm_all_locks_mutex);
diff -urNp linux-2.6.32.27/mm/mprotect.c linux-2.6.32.27/mm/mprotect.c
--- linux-2.6.32.27/mm/mprotect.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/mm/mprotect.c 2010-12-09 18:43:07.000000000 -0500
++++ linux-2.6.32.27/mm/mprotect.c 2010-12-31 14:46:53.000000000 -0500
@@ -24,10 +24,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
@@ -56357,7 +56152,7 @@ diff -urNp linux-2.6.32.27/mm/mprotect.c linux-2.6.32.27/mm/mprotect.c
if (nstart < prev->vm_end)
diff -urNp linux-2.6.32.27/mm/mremap.c linux-2.6.32.27/mm/mremap.c
--- linux-2.6.32.27/mm/mremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/mremap.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/mremap.c 2010-12-31 14:46:53.000000000 -0500
@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -56464,7 +56259,7 @@ diff -urNp linux-2.6.32.27/mm/mremap.c linux-2.6.32.27/mm/mremap.c
if (ret & ~PAGE_MASK)
diff -urNp linux-2.6.32.27/mm/nommu.c linux-2.6.32.27/mm/nommu.c
--- linux-2.6.32.27/mm/nommu.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/mm/nommu.c 2010-12-09 18:30:44.000000000 -0500
++++ linux-2.6.32.27/mm/nommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
int sysctl_overcommit_ratio = 50; /* default is 50% */
int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -56491,7 +56286,7 @@ diff -urNp linux-2.6.32.27/mm/nommu.c linux-2.6.32.27/mm/nommu.c
*/
diff -urNp linux-2.6.32.27/mm/page_alloc.c linux-2.6.32.27/mm/page_alloc.c
--- linux-2.6.32.27/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/mm/page_alloc.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/page_alloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -587,6 +587,10 @@ static void __free_pages_ok(struct page
int bad = 0;
int wasMlocked = __TestClearPageMlocked(page);
@@ -56550,7 +56345,7 @@ diff -urNp linux-2.6.32.27/mm/page_alloc.c linux-2.6.32.27/mm/page_alloc.c
diff -urNp linux-2.6.32.27/mm/percpu.c linux-2.6.32.27/mm/percpu.c
--- linux-2.6.32.27/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/mm/percpu.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/percpu.c 2010-12-31 14:46:53.000000000 -0500
@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
@@ -56562,7 +56357,7 @@ diff -urNp linux-2.6.32.27/mm/percpu.c linux-2.6.32.27/mm/percpu.c
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
diff -urNp linux-2.6.32.27/mm/rmap.c linux-2.6.32.27/mm/rmap.c
--- linux-2.6.32.27/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/rmap.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/rmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
/* page_table_lock to protect against threads */
spin_lock(&mm->page_table_lock);
@@ -56583,7 +56378,7 @@ diff -urNp linux-2.6.32.27/mm/rmap.c linux-2.6.32.27/mm/rmap.c
allocated = NULL;
diff -urNp linux-2.6.32.27/mm/shmem.c linux-2.6.32.27/mm/shmem.c
--- linux-2.6.32.27/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/shmem.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/shmem.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,7 +31,7 @@
#include <linux/swap.h>
#include <linux/ima.h>
@@ -56595,7 +56390,7 @@ diff -urNp linux-2.6.32.27/mm/shmem.c linux-2.6.32.27/mm/shmem.c
/*
diff -urNp linux-2.6.32.27/mm/slab.c linux-2.6.32.27/mm/slab.c
--- linux-2.6.32.27/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.27/mm/slab.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/slab.c 2010-12-31 14:46:53.000000000 -0500
@@ -308,7 +308,7 @@ struct kmem_list3 {
* Need this for bootstrapping a per node allocator.
*/
@@ -56703,7 +56498,7 @@ diff -urNp linux-2.6.32.27/mm/slab.c linux-2.6.32.27/mm/slab.c
* @objp: Pointer to the object
diff -urNp linux-2.6.32.27/mm/slob.c linux-2.6.32.27/mm/slob.c
--- linux-2.6.32.27/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/slob.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/slob.c 2010-12-31 14:46:53.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
@@ -57026,7 +56821,7 @@ diff -urNp linux-2.6.32.27/mm/slob.c linux-2.6.32.27/mm/slob.c
trace_kmem_cache_free(_RET_IP_, b);
diff -urNp linux-2.6.32.27/mm/slub.c linux-2.6.32.27/mm/slub.c
--- linux-2.6.32.27/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/slub.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/slub.c 2010-12-31 14:46:53.000000000 -0500
@@ -410,7 +410,7 @@ static void print_track(const char *s, s
if (!t->addr)
return;
@@ -57200,7 +56995,7 @@ diff -urNp linux-2.6.32.27/mm/slub.c linux-2.6.32.27/mm/slub.c
module_init(slab_proc_init);
diff -urNp linux-2.6.32.27/mm/util.c linux-2.6.32.27/mm/util.c
--- linux-2.6.32.27/mm/util.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/mm/util.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/util.c 2010-12-31 14:46:53.000000000 -0500
@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -57216,7 +57011,7 @@ diff -urNp linux-2.6.32.27/mm/util.c linux-2.6.32.27/mm/util.c
}
diff -urNp linux-2.6.32.27/mm/vmalloc.c linux-2.6.32.27/mm/vmalloc.c
--- linux-2.6.32.27/mm/vmalloc.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.27/mm/vmalloc.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/vmalloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
@@ -57455,7 +57250,7 @@ diff -urNp linux-2.6.32.27/mm/vmalloc.c linux-2.6.32.27/mm/vmalloc.c
diff -urNp linux-2.6.32.27/mm/vmstat.c linux-2.6.32.27/mm/vmstat.c
--- linux-2.6.32.27/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.27/mm/vmstat.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/mm/vmstat.c 2010-12-31 14:54:42.000000000 -0500
@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
@@ -57483,7 +57278,7 @@ diff -urNp linux-2.6.32.27/mm/vmstat.c linux-2.6.32.27/mm/vmstat.c
}
#endif
-@@ -953,10 +953,16 @@ static int __init setup_vmstat(void)
+@@ -953,10 +953,20 @@ static int __init setup_vmstat(void)
start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
@@ -57498,7 +57293,11 @@ diff -urNp linux-2.6.32.27/mm/vmstat.c linux-2.6.32.27/mm/vmstat.c
+#endif
+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
++#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
++ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
++#else
+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
++#endif
+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
+ }
#endif
@@ -57506,7 +57305,7 @@ diff -urNp linux-2.6.32.27/mm/vmstat.c linux-2.6.32.27/mm/vmstat.c
}
diff -urNp linux-2.6.32.27/net/8021q/vlan.c linux-2.6.32.27/net/8021q/vlan.c
--- linux-2.6.32.27/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/8021q/vlan.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/net/8021q/vlan.c 2010-12-31 14:46:53.000000000 -0500
@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
@@ -57519,7 +57318,7 @@ diff -urNp linux-2.6.32.27/net/8021q/vlan.c linux-2.6.32.27/net/8021q/vlan.c
vn = net_generic(net, vlan_net_id);
diff -urNp linux-2.6.32.27/net/atm/atm_misc.c linux-2.6.32.27/net/atm/atm_misc.c
--- linux-2.6.32.27/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/atm/atm_misc.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/atm/atm_misc.c 2010-12-31 14:46:53.000000000 -0500
@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
return 1;
@@ -57558,7 +57357,7 @@ diff -urNp linux-2.6.32.27/net/atm/atm_misc.c linux-2.6.32.27/net/atm/atm_misc.c
}
diff -urNp linux-2.6.32.27/net/atm/proc.c linux-2.6.32.27/net/atm/proc.c
--- linux-2.6.32.27/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/atm/proc.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/atm/proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -57587,7 +57386,7 @@ diff -urNp linux-2.6.32.27/net/atm/proc.c linux-2.6.32.27/net/atm/proc.c
else
diff -urNp linux-2.6.32.27/net/atm/resources.c linux-2.6.32.27/net/atm/resources.c
--- linux-2.6.32.27/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/atm/resources.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/atm/resources.c 2010-12-31 14:46:53.000000000 -0500
@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
static void copy_aal_stats(struct k_atm_aal_stats *from,
struct atm_aal_stats *to)
@@ -57608,7 +57407,7 @@ diff -urNp linux-2.6.32.27/net/atm/resources.c linux-2.6.32.27/net/atm/resources
}
diff -urNp linux-2.6.32.27/net/ax25/af_ax25.c linux-2.6.32.27/net/ax25/af_ax25.c
--- linux-2.6.32.27/net/ax25/af_ax25.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ax25/af_ax25.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ax25/af_ax25.c 2010-12-31 14:46:53.000000000 -0500
@@ -1391,6 +1391,7 @@ static int ax25_getname(struct socket *s
ax25_cb *ax25;
int err = 0;
@@ -57627,7 +57426,7 @@ diff -urNp linux-2.6.32.27/net/ax25/af_ax25.c linux-2.6.32.27/net/ax25/af_ax25.c
ndigi = ax25->digipeat->ndigi;
diff -urNp linux-2.6.32.27/net/bridge/br_private.h linux-2.6.32.27/net/bridge/br_private.h
--- linux-2.6.32.27/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/bridge/br_private.h 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/bridge/br_private.h 2010-12-31 14:46:53.000000000 -0500
@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
#ifdef CONFIG_SYSFS
@@ -57639,7 +57438,7 @@ diff -urNp linux-2.6.32.27/net/bridge/br_private.h linux-2.6.32.27/net/bridge/br
/* br_sysfs_br.c */
diff -urNp linux-2.6.32.27/net/bridge/br_stp_if.c linux-2.6.32.27/net/bridge/br_stp_if.c
--- linux-2.6.32.27/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/bridge/br_stp_if.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/bridge/br_stp_if.c 2010-12-31 14:46:53.000000000 -0500
@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
char *envp[] = { NULL };
@@ -57651,7 +57450,7 @@ diff -urNp linux-2.6.32.27/net/bridge/br_stp_if.c linux-2.6.32.27/net/bridge/br_
diff -urNp linux-2.6.32.27/net/bridge/br_sysfs_if.c linux-2.6.32.27/net/bridge/br_sysfs_if.c
--- linux-2.6.32.27/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/bridge/br_sysfs_if.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/bridge/br_sysfs_if.c 2010-12-31 14:46:53.000000000 -0500
@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
return ret;
}
@@ -57663,7 +57462,7 @@ diff -urNp linux-2.6.32.27/net/bridge/br_sysfs_if.c linux-2.6.32.27/net/bridge/b
};
diff -urNp linux-2.6.32.27/net/core/dev.c linux-2.6.32.27/net/core/dev.c
--- linux-2.6.32.27/net/core/dev.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/net/core/dev.c 2010-12-09 18:30:44.000000000 -0500
++++ linux-2.6.32.27/net/core/dev.c 2010-12-31 14:46:53.000000000 -0500
@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
@@ -57684,7 +57483,7 @@ diff -urNp linux-2.6.32.27/net/core/dev.c linux-2.6.32.27/net/core/dev.c
unsigned long time_limit = jiffies + 2;
diff -urNp linux-2.6.32.27/net/core/flow.c linux-2.6.32.27/net/core/flow.c
--- linux-2.6.32.27/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/core/flow.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/core/flow.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
static u32 flow_hash_shift;
@@ -57714,7 +57513,7 @@ diff -urNp linux-2.6.32.27/net/core/flow.c linux-2.6.32.27/net/core/flow.c
diff -urNp linux-2.6.32.27/net/dccp/ccids/ccid3.c linux-2.6.32.27/net/dccp/ccids/ccid3.c
--- linux-2.6.32.27/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/dccp/ccids/ccid3.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/dccp/ccids/ccid3.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@
static int ccid3_debug;
#define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -57726,7 +57525,7 @@ diff -urNp linux-2.6.32.27/net/dccp/ccids/ccid3.c linux-2.6.32.27/net/dccp/ccids
/*
diff -urNp linux-2.6.32.27/net/dccp/dccp.h linux-2.6.32.27/net/dccp/dccp.h
--- linux-2.6.32.27/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/dccp/dccp.h 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/dccp/dccp.h 2010-12-31 14:46:53.000000000 -0500
@@ -44,9 +44,9 @@ extern int dccp_debug;
#define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
#define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -57742,7 +57541,7 @@ diff -urNp linux-2.6.32.27/net/dccp/dccp.h linux-2.6.32.27/net/dccp/dccp.h
extern struct inet_hashinfo dccp_hashinfo;
diff -urNp linux-2.6.32.27/net/decnet/sysctl_net_decnet.c linux-2.6.32.27/net/decnet/sysctl_net_decnet.c
--- linux-2.6.32.27/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/decnet/sysctl_net_decnet.c 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/decnet/sysctl_net_decnet.c 2010-12-31 14:46:53.000000000 -0500
@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
@@ -57763,7 +57562,7 @@ diff -urNp linux-2.6.32.27/net/decnet/sysctl_net_decnet.c linux-2.6.32.27/net/de
*lenp = len;
diff -urNp linux-2.6.32.27/net/econet/Kconfig linux-2.6.32.27/net/econet/Kconfig
--- linux-2.6.32.27/net/econet/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/econet/Kconfig 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/econet/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -4,7 +4,7 @@
config ECONET
@@ -57775,7 +57574,7 @@ diff -urNp linux-2.6.32.27/net/econet/Kconfig linux-2.6.32.27/net/econet/Kconfig
Acorn computers to access file and print servers. It uses native
diff -urNp linux-2.6.32.27/net/ipv4/inet_diag.c linux-2.6.32.27/net/ipv4/inet_diag.c
--- linux-2.6.32.27/net/ipv4/inet_diag.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/inet_diag.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/inet_diag.c 2010-12-31 14:46:53.000000000 -0500
@@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc
r->idiag_retrans = 0;
@@ -57838,7 +57637,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/inet_diag.c linux-2.6.32.27/net/ipv4/inet_di
if (tmo < 0)
diff -urNp linux-2.6.32.27/net/ipv4/inet_hashtables.c linux-2.6.32.27/net/ipv4/inet_hashtables.c
--- linux-2.6.32.27/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/inet_hashtables.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/inet_hashtables.c 2010-12-31 14:46:53.000000000 -0500
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -57865,7 +57664,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/inet_hashtables.c linux-2.6.32.27/net/ipv4/i
inet_twsk_put(tw);
diff -urNp linux-2.6.32.27/net/ipv4/inetpeer.c linux-2.6.32.27/net/ipv4/inetpeer.c
--- linux-2.6.32.27/net/ipv4/inetpeer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/inetpeer.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/inetpeer.c 2010-12-31 14:46:53.000000000 -0500
@@ -389,7 +389,7 @@ struct inet_peer *inet_getpeer(__be32 da
return NULL;
n->v4daddr = daddr;
@@ -57877,7 +57676,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/inetpeer.c linux-2.6.32.27/net/ipv4/inetpeer
diff -urNp linux-2.6.32.27/net/ipv4/ip_fragment.c linux-2.6.32.27/net/ipv4/ip_fragment.c
--- linux-2.6.32.27/net/ipv4/ip_fragment.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/ip_fragment.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/ip_fragment.c 2010-12-31 14:46:53.000000000 -0500
@@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct
return 0;
@@ -57889,7 +57688,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/ip_fragment.c linux-2.6.32.27/net/ipv4/ip_fr
rc = qp->q.fragments && (end - start) > max;
diff -urNp linux-2.6.32.27/net/ipv4/netfilter/arp_tables.c linux-2.6.32.27/net/ipv4/netfilter/arp_tables.c
--- linux-2.6.32.27/net/ipv4/netfilter/arp_tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/netfilter/arp_tables.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/netfilter/arp_tables.c 2010-12-31 14:46:53.000000000 -0500
@@ -934,6 +934,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -57900,7 +57699,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/netfilter/arp_tables.c linux-2.6.32.27/net/i
sizeof(info.hook_entry));
diff -urNp linux-2.6.32.27/net/ipv4/netfilter/ip_tables.c linux-2.6.32.27/net/ipv4/netfilter/ip_tables.c
--- linux-2.6.32.27/net/ipv4/netfilter/ip_tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/netfilter/ip_tables.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/netfilter/ip_tables.c 2010-12-31 14:46:53.000000000 -0500
@@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -57911,7 +57710,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/netfilter/ip_tables.c linux-2.6.32.27/net/ip
sizeof(info.hook_entry));
diff -urNp linux-2.6.32.27/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.27/net/ipv4/netfilter/nf_nat_snmp_basic.c
--- linux-2.6.32.27/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-12-31 14:46:53.000000000 -0500
@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
@@ -57923,7 +57722,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.2
printk("OOM in bsalg (%d)\n", __LINE__);
diff -urNp linux-2.6.32.27/net/ipv4/tcp.c linux-2.6.32.27/net/ipv4/tcp.c
--- linux-2.6.32.27/net/ipv4/tcp.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/net/ipv4/tcp.c 2010-12-09 18:30:47.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/tcp.c 2010-12-31 14:46:53.000000000 -0500
@@ -2117,7 +2117,7 @@ static int do_tcp_setsockopt(struct sock
/* Values greater than interface MTU won't take effect. However
* at the point when this call is done we typically don't yet
@@ -57935,7 +57734,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/tcp.c linux-2.6.32.27/net/ipv4/tcp.c
}
diff -urNp linux-2.6.32.27/net/ipv4/tcp_ipv4.c linux-2.6.32.27/net/ipv4/tcp_ipv4.c
--- linux-2.6.32.27/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/tcp_ipv4.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/tcp_ipv4.c 2010-12-31 14:46:53.000000000 -0500
@@ -84,6 +84,9 @@
int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
@@ -58033,7 +57832,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/tcp_ipv4.c linux-2.6.32.27/net/ipv4/tcp_ipv4
#define TMPSZ 150
diff -urNp linux-2.6.32.27/net/ipv4/tcp_minisocks.c linux-2.6.32.27/net/ipv4/tcp_minisocks.c
--- linux-2.6.32.27/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/tcp_minisocks.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/tcp_minisocks.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,6 +26,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -58058,7 +57857,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/tcp_minisocks.c linux-2.6.32.27/net/ipv4/tcp
diff -urNp linux-2.6.32.27/net/ipv4/tcp_probe.c linux-2.6.32.27/net/ipv4/tcp_probe.c
--- linux-2.6.32.27/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/tcp_probe.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/tcp_probe.c 2010-12-31 14:46:53.000000000 -0500
@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
@@ -58070,7 +57869,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/tcp_probe.c linux-2.6.32.27/net/ipv4/tcp_pro
}
diff -urNp linux-2.6.32.27/net/ipv4/tcp_timer.c linux-2.6.32.27/net/ipv4/tcp_timer.c
--- linux-2.6.32.27/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400
-+++ linux-2.6.32.27/net/ipv4/tcp_timer.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/tcp_timer.c 2010-12-31 14:46:53.000000000 -0500
@@ -21,6 +21,10 @@
#include <linux/module.h>
#include <net/tcp.h>
@@ -58098,7 +57897,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/tcp_timer.c linux-2.6.32.27/net/ipv4/tcp_tim
tcp_write_err(sk);
diff -urNp linux-2.6.32.27/net/ipv4/udp.c linux-2.6.32.27/net/ipv4/udp.c
--- linux-2.6.32.27/net/ipv4/udp.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/net/ipv4/udp.c 2010-12-09 18:30:47.000000000 -0500
++++ linux-2.6.32.27/net/ipv4/udp.c 2010-12-31 14:46:53.000000000 -0500
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
@@ -58184,7 +57983,7 @@ diff -urNp linux-2.6.32.27/net/ipv4/udp.c linux-2.6.32.27/net/ipv4/udp.c
diff -urNp linux-2.6.32.27/net/ipv6/exthdrs.c linux-2.6.32.27/net/ipv6/exthdrs.c
--- linux-2.6.32.27/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv6/exthdrs.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/net/ipv6/exthdrs.c 2010-12-31 14:46:53.000000000 -0500
@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
.type = IPV6_TLV_JUMBO,
.func = ipv6_hop_jumbo,
@@ -58196,7 +57995,7 @@ diff -urNp linux-2.6.32.27/net/ipv6/exthdrs.c linux-2.6.32.27/net/ipv6/exthdrs.c
int ipv6_parse_hopopts(struct sk_buff *skb)
diff -urNp linux-2.6.32.27/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.27/net/ipv6/netfilter/ip6_tables.c
--- linux-2.6.32.27/net/ipv6/netfilter/ip6_tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv6/netfilter/ip6_tables.c 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/ipv6/netfilter/ip6_tables.c 2010-12-31 14:46:53.000000000 -0500
@@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -58207,7 +58006,7 @@ diff -urNp linux-2.6.32.27/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.27/net/i
sizeof(info.hook_entry));
diff -urNp linux-2.6.32.27/net/ipv6/raw.c linux-2.6.32.27/net/ipv6/raw.c
--- linux-2.6.32.27/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv6/raw.c 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/ipv6/raw.c 2010-12-31 14:46:53.000000000 -0500
@@ -600,7 +600,7 @@ out:
return err;
}
@@ -58234,7 +58033,7 @@ diff -urNp linux-2.6.32.27/net/ipv6/raw.c linux-2.6.32.27/net/ipv6/raw.c
static int raw6_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-2.6.32.27/net/ipv6/tcp_ipv6.c linux-2.6.32.27/net/ipv6/tcp_ipv6.c
--- linux-2.6.32.27/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv6/tcp_ipv6.c 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/ipv6/tcp_ipv6.c 2010-12-31 14:46:53.000000000 -0500
@@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
@@ -58336,7 +58135,7 @@ diff -urNp linux-2.6.32.27/net/ipv6/tcp_ipv6.c linux-2.6.32.27/net/ipv6/tcp_ipv6
static int tcp6_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-2.6.32.27/net/ipv6/udp.c linux-2.6.32.27/net/ipv6/udp.c
--- linux-2.6.32.27/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/ipv6/udp.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/net/ipv6/udp.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,6 +49,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
@@ -58372,9 +58171,45 @@ diff -urNp linux-2.6.32.27/net/ipv6/udp.c linux-2.6.32.27/net/ipv6/udp.c
atomic_read(&sp->sk_drops));
}
+diff -urNp linux-2.6.32.27/net/irda/af_irda.c linux-2.6.32.27/net/irda/af_irda.c
+--- linux-2.6.32.27/net/irda/af_irda.c 2010-09-26 17:26:06.000000000 -0400
++++ linux-2.6.32.27/net/irda/af_irda.c 2010-12-31 15:16:57.000000000 -0500
+@@ -2164,6 +2164,15 @@ static int irda_getsockopt(struct socket
+
+ switch (optname) {
+ case IRLMP_ENUMDEVICES:
++
++ /* Offset to first device entry */
++ offset = sizeof(struct irda_device_list) - sizeof(struct irda_device_info);
++
++ if (len < offset) {
++ err = -EINVAL;
++ goto out;
++ }
++
+ /* Ask lmp for the current discovery log */
+ discoveries = irlmp_get_discoveries(&list.len, self->mask.word,
+ self->nslots);
+@@ -2173,15 +2182,9 @@ static int irda_getsockopt(struct socket
+ err = 0;
+
+ /* Write total list length back to client */
+- if (copy_to_user(optval, &list,
+- sizeof(struct irda_device_list) -
+- sizeof(struct irda_device_info)))
++ if (copy_to_user(optval, &list, offset))
+ err = -EFAULT;
+
+- /* Offset to first device entry */
+- offset = sizeof(struct irda_device_list) -
+- sizeof(struct irda_device_info);
+-
+ /* Copy the list itself - watch for overflow */
+ if(list.len > 2048)
+ {
diff -urNp linux-2.6.32.27/net/irda/ircomm/ircomm_tty.c linux-2.6.32.27/net/irda/ircomm/ircomm_tty.c
--- linux-2.6.32.27/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/irda/ircomm/ircomm_tty.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/irda/ircomm/ircomm_tty.c 2010-12-31 14:46:53.000000000 -0500
@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
@@ -58499,7 +58334,7 @@ diff -urNp linux-2.6.32.27/net/irda/ircomm/ircomm_tty.c linux-2.6.32.27/net/irda
diff -urNp linux-2.6.32.27/net/key/af_key.c linux-2.6.32.27/net/key/af_key.c
--- linux-2.6.32.27/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/key/af_key.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/key/af_key.c 2010-12-31 14:46:53.000000000 -0500
@@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
else
@@ -58514,7 +58349,7 @@ diff -urNp linux-2.6.32.27/net/key/af_key.c linux-2.6.32.27/net/key/af_key.c
sk_wmem_alloc_get(s),
diff -urNp linux-2.6.32.27/net/mac80211/debugfs_key.c linux-2.6.32.27/net/mac80211/debugfs_key.c
--- linux-2.6.32.27/net/mac80211/debugfs_key.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/mac80211/debugfs_key.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/mac80211/debugfs_key.c 2010-12-31 14:46:53.000000000 -0500
@@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file
size_t count, loff_t *ppos)
{
@@ -58532,7 +58367,7 @@ diff -urNp linux-2.6.32.27/net/mac80211/debugfs_key.c linux-2.6.32.27/net/mac802
p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
diff -urNp linux-2.6.32.27/net/mac80211/ieee80211_i.h linux-2.6.32.27/net/mac80211/ieee80211_i.h
--- linux-2.6.32.27/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/mac80211/ieee80211_i.h 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/mac80211/ieee80211_i.h 2010-12-31 14:46:53.000000000 -0500
@@ -635,7 +635,7 @@ struct ieee80211_local {
/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
spinlock_t queue_stop_reason_lock;
@@ -58544,7 +58379,7 @@ diff -urNp linux-2.6.32.27/net/mac80211/ieee80211_i.h linux-2.6.32.27/net/mac802
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
diff -urNp linux-2.6.32.27/net/mac80211/iface.c linux-2.6.32.27/net/mac80211/iface.c
--- linux-2.6.32.27/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/mac80211/iface.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/mac80211/iface.c 2010-12-31 14:46:53.000000000 -0500
@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
break;
}
@@ -58601,7 +58436,7 @@ diff -urNp linux-2.6.32.27/net/mac80211/iface.c linux-2.6.32.27/net/mac80211/ifa
diff -urNp linux-2.6.32.27/net/mac80211/main.c linux-2.6.32.27/net/mac80211/main.c
--- linux-2.6.32.27/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/mac80211/main.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/mac80211/main.c 2010-12-31 14:46:53.000000000 -0500
@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
@@ -58613,7 +58448,7 @@ diff -urNp linux-2.6.32.27/net/mac80211/main.c linux-2.6.32.27/net/mac80211/main
* Goal:
diff -urNp linux-2.6.32.27/net/mac80211/pm.c linux-2.6.32.27/net/mac80211/pm.c
--- linux-2.6.32.27/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/mac80211/pm.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/mac80211/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
}
@@ -58625,7 +58460,7 @@ diff -urNp linux-2.6.32.27/net/mac80211/pm.c linux-2.6.32.27/net/mac80211/pm.c
local->suspended = true;
diff -urNp linux-2.6.32.27/net/mac80211/rate.c linux-2.6.32.27/net/mac80211/rate.c
--- linux-2.6.32.27/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/mac80211/rate.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/mac80211/rate.c 2010-12-31 14:46:53.000000000 -0500
@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
struct rate_control_ref *ref, *old;
@@ -58637,7 +58472,7 @@ diff -urNp linux-2.6.32.27/net/mac80211/rate.c linux-2.6.32.27/net/mac80211/rate
ref = rate_control_alloc(name, local);
diff -urNp linux-2.6.32.27/net/mac80211/tx.c linux-2.6.32.27/net/mac80211/tx.c
--- linux-2.6.32.27/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/mac80211/tx.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/mac80211/tx.c 2010-12-31 14:46:53.000000000 -0500
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
return cpu_to_le16(dur);
}
@@ -58649,7 +58484,7 @@ diff -urNp linux-2.6.32.27/net/mac80211/tx.c linux-2.6.32.27/net/mac80211/tx.c
return local == wdev_priv(dev->ieee80211_ptr);
diff -urNp linux-2.6.32.27/net/mac80211/util.c linux-2.6.32.27/net/mac80211/util.c
--- linux-2.6.32.27/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/mac80211/util.c 2010-12-09 18:12:40.000000000 -0500
++++ linux-2.6.32.27/net/mac80211/util.c 2010-12-31 14:46:53.000000000 -0500
@@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
local->resuming = true;
@@ -58661,7 +58496,7 @@ diff -urNp linux-2.6.32.27/net/mac80211/util.c linux-2.6.32.27/net/mac80211/util
* various platform / driver / bus issues, so restarting
diff -urNp linux-2.6.32.27/net/netfilter/Kconfig linux-2.6.32.27/net/netfilter/Kconfig
--- linux-2.6.32.27/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/netfilter/Kconfig 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/netfilter/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
@@ -58681,7 +58516,7 @@ diff -urNp linux-2.6.32.27/net/netfilter/Kconfig linux-2.6.32.27/net/netfilter/K
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
diff -urNp linux-2.6.32.27/net/netfilter/Makefile linux-2.6.32.27/net/netfilter/Makefile
--- linux-2.6.32.27/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/netfilter/Makefile 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/netfilter/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -58692,7 +58527,7 @@ diff -urNp linux-2.6.32.27/net/netfilter/Makefile linux-2.6.32.27/net/netfilter/
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
diff -urNp linux-2.6.32.27/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.27/net/netfilter/nf_conntrack_netlink.c
--- linux-2.6.32.27/net/netfilter/nf_conntrack_netlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/netfilter/nf_conntrack_netlink.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/netfilter/nf_conntrack_netlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt
static int
ctnetlink_parse_tuple(const struct nlattr * const cda[],
@@ -58704,7 +58539,7 @@ diff -urNp linux-2.6.32.27/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.27/
int err;
diff -urNp linux-2.6.32.27/net/netfilter/xt_gradm.c linux-2.6.32.27/net/netfilter/xt_gradm.c
--- linux-2.6.32.27/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.27/net/netfilter/xt_gradm.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/netfilter/xt_gradm.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,51 @@
+/*
+ * gradm match for netfilter
@@ -58759,7 +58594,7 @@ diff -urNp linux-2.6.32.27/net/netfilter/xt_gradm.c linux-2.6.32.27/net/netfilte
+MODULE_ALIAS("ip6t_gradm");
diff -urNp linux-2.6.32.27/net/netlink/af_netlink.c linux-2.6.32.27/net/netlink/af_netlink.c
--- linux-2.6.32.27/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.27/net/netlink/af_netlink.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/netlink/af_netlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f
struct netlink_sock *nlk = nlk_sk(s);
@@ -58784,7 +58619,7 @@ diff -urNp linux-2.6.32.27/net/netlink/af_netlink.c linux-2.6.32.27/net/netlink/
);
diff -urNp linux-2.6.32.27/net/netrom/af_netrom.c linux-2.6.32.27/net/netrom/af_netrom.c
--- linux-2.6.32.27/net/netrom/af_netrom.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/netrom/af_netrom.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/netrom/af_netrom.c 2010-12-31 14:46:53.000000000 -0500
@@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc
struct sock *sk = sock->sk;
struct nr_sock *nr = nr_sk(sk);
@@ -58803,7 +58638,7 @@ diff -urNp linux-2.6.32.27/net/netrom/af_netrom.c linux-2.6.32.27/net/netrom/af_
}
diff -urNp linux-2.6.32.27/net/packet/af_packet.c linux-2.6.32.27/net/packet/af_packet.c
--- linux-2.6.32.27/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/packet/af_packet.c 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/packet/af_packet.c 2010-12-31 14:46:53.000000000 -0500
@@ -1526,7 +1526,7 @@ static int packet_getname_spkt(struct so
uaddr->sa_family = AF_PACKET;
dev = dev_get_by_index(sock_net(sk), pkt_sk(sk)->ifindex);
@@ -58835,7 +58670,7 @@ diff -urNp linux-2.6.32.27/net/packet/af_packet.c linux-2.6.32.27/net/packet/af_
ntohs(po->num),
diff -urNp linux-2.6.32.27/net/phonet/af_phonet.c linux-2.6.32.27/net/phonet/af_phonet.c
--- linux-2.6.32.27/net/phonet/af_phonet.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/net/phonet/af_phonet.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/phonet/af_phonet.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
{
struct phonet_protocol *pp;
@@ -58856,7 +58691,7 @@ diff -urNp linux-2.6.32.27/net/phonet/af_phonet.c linux-2.6.32.27/net/phonet/af_
err = proto_register(pp->prot, 1);
diff -urNp linux-2.6.32.27/net/phonet/socket.c linux-2.6.32.27/net/phonet/socket.c
--- linux-2.6.32.27/net/phonet/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/phonet/socket.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/phonet/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -482,7 +482,12 @@ static int pn_sock_seq_show(struct seq_f
sk->sk_state,
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -58873,7 +58708,7 @@ diff -urNp linux-2.6.32.27/net/phonet/socket.c linux-2.6.32.27/net/phonet/socket
seq_printf(seq, "%*s\n", 127 - len, "");
diff -urNp linux-2.6.32.27/net/rds/Kconfig linux-2.6.32.27/net/rds/Kconfig
--- linux-2.6.32.27/net/rds/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/rds/Kconfig 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/rds/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -1,7 +1,7 @@
config RDS
@@ -58885,7 +58720,7 @@ diff -urNp linux-2.6.32.27/net/rds/Kconfig linux-2.6.32.27/net/rds/Kconfig
sequenced delivery of datagrams over Infiniband, iWARP,
diff -urNp linux-2.6.32.27/net/sctp/auth.c linux-2.6.32.27/net/sctp/auth.c
--- linux-2.6.32.27/net/sctp/auth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/sctp/auth.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/net/sctp/auth.c 2010-12-31 14:46:53.000000000 -0500
@@ -542,16 +542,20 @@ struct sctp_hmac *sctp_auth_asoc_get_hma
id = ntohs(hmacs->hmac_ids[i]);
@@ -58911,7 +58746,7 @@ diff -urNp linux-2.6.32.27/net/sctp/auth.c linux-2.6.32.27/net/sctp/auth.c
}
diff -urNp linux-2.6.32.27/net/sctp/proc.c linux-2.6.32.27/net/sctp/proc.c
--- linux-2.6.32.27/net/sctp/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/sctp/proc.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/net/sctp/proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_
sctp_for_each_hentry(epb, node, &head->chain) {
ep = sctp_ep(epb);
@@ -58942,7 +58777,7 @@ diff -urNp linux-2.6.32.27/net/sctp/proc.c linux-2.6.32.27/net/sctp/proc.c
assoc->sndbuf_used,
diff -urNp linux-2.6.32.27/net/sctp/socket.c linux-2.6.32.27/net/sctp/socket.c
--- linux-2.6.32.27/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/sctp/socket.c 2010-12-09 18:12:42.000000000 -0500
++++ linux-2.6.32.27/net/sctp/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
struct sctp_sndrcvinfo *sinfo;
struct sctp_initmsg *sinit;
@@ -58962,7 +58797,7 @@ diff -urNp linux-2.6.32.27/net/sctp/socket.c linux-2.6.32.27/net/sctp/socket.c
if (pp->fastreuse && sk->sk_reuse &&
diff -urNp linux-2.6.32.27/net/socket.c linux-2.6.32.27/net/socket.c
--- linux-2.6.32.27/net/socket.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/net/socket.c 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -87,6 +87,7 @@
#include <linux/wireless.h>
#include <linux/nsproxy.h>
@@ -59128,7 +58963,7 @@ diff -urNp linux-2.6.32.27/net/socket.c linux-2.6.32.27/net/socket.c
if (err)
diff -urNp linux-2.6.32.27/net/sunrpc/sched.c linux-2.6.32.27/net/sunrpc/sched.c
--- linux-2.6.32.27/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/sunrpc/sched.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/sunrpc/sched.c 2010-12-31 14:46:53.000000000 -0500
@@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
#ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -59144,7 +58979,7 @@ diff -urNp linux-2.6.32.27/net/sunrpc/sched.c linux-2.6.32.27/net/sunrpc/sched.c
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
diff -urNp linux-2.6.32.27/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.27/net/sunrpc/xprtrdma/svc_rdma.c
--- linux-2.6.32.27/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/sunrpc/xprtrdma/svc_rdma.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/sunrpc/xprtrdma/svc_rdma.c 2010-12-31 14:46:53.000000000 -0500
@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
len -= *ppos;
if (len > *lenp)
@@ -59156,7 +58991,7 @@ diff -urNp linux-2.6.32.27/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.27/net/su
*ppos += len;
diff -urNp linux-2.6.32.27/net/sysctl_net.c linux-2.6.32.27/net/sysctl_net.c
--- linux-2.6.32.27/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/sysctl_net.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/sysctl_net.c 2010-12-31 14:46:53.000000000 -0500
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
@@ -59168,7 +59003,7 @@ diff -urNp linux-2.6.32.27/net/sysctl_net.c linux-2.6.32.27/net/sysctl_net.c
}
diff -urNp linux-2.6.32.27/net/tipc/socket.c linux-2.6.32.27/net/tipc/socket.c
--- linux-2.6.32.27/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/tipc/socket.c 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/tipc/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -393,6 +393,7 @@ static int get_name(struct socket *sock,
struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
struct tipc_sock *tsock = tipc_sk(sock->sk);
@@ -59191,7 +59026,7 @@ diff -urNp linux-2.6.32.27/net/tipc/socket.c linux-2.6.32.27/net/tipc/socket.c
diff -urNp linux-2.6.32.27/net/unix/af_unix.c linux-2.6.32.27/net/unix/af_unix.c
--- linux-2.6.32.27/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400
-+++ linux-2.6.32.27/net/unix/af_unix.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/unix/af_unix.c 2010-12-31 14:46:53.000000000 -0500
@@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
@@ -59263,7 +59098,7 @@ diff -urNp linux-2.6.32.27/net/unix/af_unix.c linux-2.6.32.27/net/unix/af_unix.c
s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
diff -urNp linux-2.6.32.27/net/wireless/wext.c linux-2.6.32.27/net/wireless/wext.c
--- linux-2.6.32.27/net/wireless/wext.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.27/net/wireless/wext.c 2010-12-09 18:12:41.000000000 -0500
++++ linux-2.6.32.27/net/wireless/wext.c 2010-12-31 14:46:53.000000000 -0500
@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
*/
@@ -59299,7 +59134,7 @@ diff -urNp linux-2.6.32.27/net/wireless/wext.c linux-2.6.32.27/net/wireless/wext
iwp->length += essid_compat;
diff -urNp linux-2.6.32.27/net/x25/x25_in.c linux-2.6.32.27/net/x25/x25_in.c
--- linux-2.6.32.27/net/x25/x25_in.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/net/x25/x25_in.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/x25/x25_in.c 2010-12-31 14:46:53.000000000 -0500
@@ -108,14 +108,13 @@ static int x25_state1_machine(struct soc
*/
skb_pull(skb, X25_STD_MIN_LEN);
@@ -59320,7 +59155,7 @@ diff -urNp linux-2.6.32.27/net/x25/x25_in.c linux-2.6.32.27/net/x25/x25_in.c
else
diff -urNp linux-2.6.32.27/net/xfrm/xfrm_policy.c linux-2.6.32.27/net/xfrm/xfrm_policy.c
--- linux-2.6.32.27/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/net/xfrm/xfrm_policy.c 2010-12-09 18:12:39.000000000 -0500
++++ linux-2.6.32.27/net/xfrm/xfrm_policy.c 2010-12-31 14:46:53.000000000 -0500
@@ -1477,7 +1477,7 @@ free_dst:
goto out;
}
@@ -59350,7 +59185,7 @@ diff -urNp linux-2.6.32.27/net/xfrm/xfrm_policy.c linux-2.6.32.27/net/xfrm/xfrm_
#ifdef CONFIG_XFRM_SUB_POLICY
diff -urNp linux-2.6.32.27/samples/kobject/kset-example.c linux-2.6.32.27/samples/kobject/kset-example.c
--- linux-2.6.32.27/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/samples/kobject/kset-example.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/samples/kobject/kset-example.c 2010-12-31 14:46:53.000000000 -0500
@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
}
@@ -59362,7 +59197,7 @@ diff -urNp linux-2.6.32.27/samples/kobject/kset-example.c linux-2.6.32.27/sample
};
diff -urNp linux-2.6.32.27/scripts/basic/fixdep.c linux-2.6.32.27/scripts/basic/fixdep.c
--- linux-2.6.32.27/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/scripts/basic/fixdep.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/scripts/basic/fixdep.c 2010-12-31 14:46:53.000000000 -0500
@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
static void parse_config_file(char *map, size_t len)
@@ -59386,7 +59221,7 @@ diff -urNp linux-2.6.32.27/scripts/basic/fixdep.c linux-2.6.32.27/scripts/basic/
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
diff -urNp linux-2.6.32.27/scripts/kallsyms.c linux-2.6.32.27/scripts/kallsyms.c
--- linux-2.6.32.27/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/scripts/kallsyms.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/scripts/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,10 +43,10 @@ struct text_range {
static unsigned long long _text;
@@ -59404,7 +59239,7 @@ diff -urNp linux-2.6.32.27/scripts/kallsyms.c linux-2.6.32.27/scripts/kallsyms.c
#define text_range_inittext (&text_ranges[1])
diff -urNp linux-2.6.32.27/scripts/mod/file2alias.c linux-2.6.32.27/scripts/mod/file2alias.c
--- linux-2.6.32.27/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/scripts/mod/file2alias.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/scripts/mod/file2alias.c 2010-12-31 14:46:53.000000000 -0500
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
@@ -59461,7 +59296,7 @@ diff -urNp linux-2.6.32.27/scripts/mod/file2alias.c linux-2.6.32.27/scripts/mod/
diff -urNp linux-2.6.32.27/scripts/mod/modpost.c linux-2.6.32.27/scripts/mod/modpost.c
--- linux-2.6.32.27/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/scripts/mod/modpost.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/scripts/mod/modpost.c 2010-12-31 14:46:53.000000000 -0500
@@ -835,6 +835,7 @@ enum mismatch {
INIT_TO_EXIT,
EXIT_TO_INIT,
@@ -59531,7 +59366,7 @@ diff -urNp linux-2.6.32.27/scripts/mod/modpost.c linux-2.6.32.27/scripts/mod/mod
tmp = NOFAIL(malloc(b->pos));
diff -urNp linux-2.6.32.27/scripts/mod/modpost.h linux-2.6.32.27/scripts/mod/modpost.h
--- linux-2.6.32.27/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/scripts/mod/modpost.h 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/scripts/mod/modpost.h 2010-12-31 14:46:53.000000000 -0500
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
@@ -59553,7 +59388,7 @@ diff -urNp linux-2.6.32.27/scripts/mod/modpost.h linux-2.6.32.27/scripts/mod/mod
struct module *next;
diff -urNp linux-2.6.32.27/scripts/mod/sumversion.c linux-2.6.32.27/scripts/mod/sumversion.c
--- linux-2.6.32.27/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/scripts/mod/sumversion.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/scripts/mod/sumversion.c 2010-12-31 14:46:53.000000000 -0500
@@ -455,7 +455,7 @@ static void write_version(const char *fi
goto out;
}
@@ -59565,7 +59400,7 @@ diff -urNp linux-2.6.32.27/scripts/mod/sumversion.c linux-2.6.32.27/scripts/mod/
goto out;
diff -urNp linux-2.6.32.27/scripts/pnmtologo.c linux-2.6.32.27/scripts/pnmtologo.c
--- linux-2.6.32.27/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/scripts/pnmtologo.c 2010-12-09 18:12:54.000000000 -0500
++++ linux-2.6.32.27/scripts/pnmtologo.c 2010-12-31 14:46:53.000000000 -0500
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
@@ -59594,7 +59429,7 @@ diff -urNp linux-2.6.32.27/scripts/pnmtologo.c linux-2.6.32.27/scripts/pnmtologo
for (i = 0; i < logo_clutsize; i++) {
diff -urNp linux-2.6.32.27/security/capability.c linux-2.6.32.27/security/capability.c
--- linux-2.6.32.27/security/capability.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/capability.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/capability.c 2010-12-31 14:46:53.000000000 -0500
@@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
}
#endif /* CONFIG_AUDIT */
@@ -59606,7 +59441,7 @@ diff -urNp linux-2.6.32.27/security/capability.c linux-2.6.32.27/security/capabi
diff -urNp linux-2.6.32.27/security/commoncap.c linux-2.6.32.27/security/commoncap.c
--- linux-2.6.32.27/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/commoncap.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/commoncap.c 2010-12-31 14:46:53.000000000 -0500
@@ -27,7 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
@@ -59641,7 +59476,7 @@ diff -urNp linux-2.6.32.27/security/commoncap.c linux-2.6.32.27/security/commonc
return 1;
diff -urNp linux-2.6.32.27/security/integrity/ima/ima_api.c linux-2.6.32.27/security/integrity/ima/ima_api.c
--- linux-2.6.32.27/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/integrity/ima/ima_api.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/integrity/ima/ima_api.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
int result;
@@ -59653,7 +59488,7 @@ diff -urNp linux-2.6.32.27/security/integrity/ima/ima_api.c linux-2.6.32.27/secu
if (!entry) {
diff -urNp linux-2.6.32.27/security/integrity/ima/ima_fs.c linux-2.6.32.27/security/integrity/ima/ima_fs.c
--- linux-2.6.32.27/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/integrity/ima/ima_fs.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/integrity/ima/ima_fs.c 2010-12-31 14:46:53.000000000 -0500
@@ -27,12 +27,12 @@
static int valid_policy = 1;
#define TMPBUFLEN 12
@@ -59671,7 +59506,7 @@ diff -urNp linux-2.6.32.27/security/integrity/ima/ima_fs.c linux-2.6.32.27/secur
diff -urNp linux-2.6.32.27/security/integrity/ima/ima.h linux-2.6.32.27/security/integrity/ima/ima.h
--- linux-2.6.32.27/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/integrity/ima/ima.h 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/integrity/ima/ima.h 2010-12-31 14:46:53.000000000 -0500
@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
@@ -59685,7 +59520,7 @@ diff -urNp linux-2.6.32.27/security/integrity/ima/ima.h linux-2.6.32.27/security
extern struct ima_h_table ima_htable;
diff -urNp linux-2.6.32.27/security/integrity/ima/ima_queue.c linux-2.6.32.27/security/integrity/ima/ima_queue.c
--- linux-2.6.32.27/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/integrity/ima/ima_queue.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/integrity/ima/ima_queue.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
INIT_LIST_HEAD(&qe->later);
list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -59697,7 +59532,7 @@ diff -urNp linux-2.6.32.27/security/integrity/ima/ima_queue.c linux-2.6.32.27/se
return 0;
diff -urNp linux-2.6.32.27/security/Kconfig linux-2.6.32.27/security/Kconfig
--- linux-2.6.32.27/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/Kconfig 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -4,6 +4,505 @@
menu "Security options"
@@ -60215,7 +60050,7 @@ diff -urNp linux-2.6.32.27/security/Kconfig linux-2.6.32.27/security/Kconfig
from userspace allocation. Keeping a user from writing to low pages
diff -urNp linux-2.6.32.27/security/min_addr.c linux-2.6.32.27/security/min_addr.c
--- linux-2.6.32.27/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/min_addr.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/min_addr.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
@@ -60234,7 +60069,7 @@ diff -urNp linux-2.6.32.27/security/min_addr.c linux-2.6.32.27/security/min_addr
/*
diff -urNp linux-2.6.32.27/security/root_plug.c linux-2.6.32.27/security/root_plug.c
--- linux-2.6.32.27/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/root_plug.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/root_plug.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,7 +70,7 @@ static int rootplug_bprm_check_security
return 0;
}
@@ -60246,7 +60081,7 @@ diff -urNp linux-2.6.32.27/security/root_plug.c linux-2.6.32.27/security/root_pl
diff -urNp linux-2.6.32.27/security/security.c linux-2.6.32.27/security/security.c
--- linux-2.6.32.27/security/security.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/security.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/security.c 2010-12-31 14:46:53.000000000 -0500
@@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI
extern struct security_operations default_security_ops;
extern void security_fixup_ops(struct security_operations *ops);
@@ -60267,7 +60102,7 @@ diff -urNp linux-2.6.32.27/security/security.c linux-2.6.32.27/security/security
printk(KERN_DEBUG "%s could not verify "
diff -urNp linux-2.6.32.27/security/selinux/hooks.c linux-2.6.32.27/security/selinux/hooks.c
--- linux-2.6.32.27/security/selinux/hooks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/selinux/hooks.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/selinux/hooks.c 2010-12-31 14:46:53.000000000 -0500
@@ -131,7 +131,7 @@ int selinux_enabled = 1;
* Minimal support for a secondary security module,
* just to allow the use of the capability module.
@@ -60298,7 +60133,7 @@ diff -urNp linux-2.6.32.27/security/selinux/hooks.c linux-2.6.32.27/security/sel
selinux_nf_ip_exit();
diff -urNp linux-2.6.32.27/security/smack/smack_lsm.c linux-2.6.32.27/security/smack/smack_lsm.c
--- linux-2.6.32.27/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/smack/smack_lsm.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/smack/smack_lsm.c 2010-12-31 14:46:53.000000000 -0500
@@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct
return 0;
}
@@ -60310,7 +60145,7 @@ diff -urNp linux-2.6.32.27/security/smack/smack_lsm.c linux-2.6.32.27/security/s
.ptrace_access_check = smack_ptrace_access_check,
diff -urNp linux-2.6.32.27/security/tomoyo/tomoyo.c linux-2.6.32.27/security/tomoyo/tomoyo.c
--- linux-2.6.32.27/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/security/tomoyo/tomoyo.c 2010-12-09 18:12:29.000000000 -0500
++++ linux-2.6.32.27/security/tomoyo/tomoyo.c 2010-12-31 14:46:53.000000000 -0500
@@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil
* tomoyo_security_ops is a "struct security_operations" which is used for
* registering TOMOYO.
@@ -60322,7 +60157,7 @@ diff -urNp linux-2.6.32.27/security/tomoyo/tomoyo.c linux-2.6.32.27/security/tom
.cred_prepare = tomoyo_cred_prepare,
diff -urNp linux-2.6.32.27/sound/aoa/codecs/onyx.c linux-2.6.32.27/sound/aoa/codecs/onyx.c
--- linux-2.6.32.27/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/aoa/codecs/onyx.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/aoa/codecs/onyx.c 2010-12-31 14:46:53.000000000 -0500
@@ -53,7 +53,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
@@ -60353,7 +60188,7 @@ diff -urNp linux-2.6.32.27/sound/aoa/codecs/onyx.c linux-2.6.32.27/sound/aoa/cod
diff -urNp linux-2.6.32.27/sound/core/oss/pcm_oss.c linux-2.6.32.27/sound/core/oss/pcm_oss.c
--- linux-2.6.32.27/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/core/oss/pcm_oss.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/core/oss/pcm_oss.c 2010-12-31 14:46:53.000000000 -0500
@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
}
}
@@ -60367,7 +60202,7 @@ diff -urNp linux-2.6.32.27/sound/core/oss/pcm_oss.c linux-2.6.32.27/sound/core/o
/*
diff -urNp linux-2.6.32.27/sound/core/seq/seq_lock.h linux-2.6.32.27/sound/core/seq/seq_lock.h
--- linux-2.6.32.27/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/core/seq/seq_lock.h 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/core/seq/seq_lock.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
#else /* SMP || CONFIG_SND_DEBUG */
@@ -60385,7 +60220,7 @@ diff -urNp linux-2.6.32.27/sound/core/seq/seq_lock.h linux-2.6.32.27/sound/core/
diff -urNp linux-2.6.32.27/sound/drivers/mts64.c linux-2.6.32.27/sound/drivers/mts64.c
--- linux-2.6.32.27/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/drivers/mts64.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/drivers/mts64.c 2010-12-31 14:46:53.000000000 -0500
@@ -65,7 +65,7 @@ struct mts64 {
struct pardevice *pardev;
int pardev_claimed;
@@ -60436,7 +60271,7 @@ diff -urNp linux-2.6.32.27/sound/drivers/mts64.c linux-2.6.32.27/sound/drivers/m
}
diff -urNp linux-2.6.32.27/sound/drivers/portman2x4.c linux-2.6.32.27/sound/drivers/portman2x4.c
--- linux-2.6.32.27/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/drivers/portman2x4.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/drivers/portman2x4.c 2010-12-31 14:46:53.000000000 -0500
@@ -83,7 +83,7 @@ struct portman {
struct pardevice *pardev;
int pardev_claimed;
@@ -60448,7 +60283,7 @@ diff -urNp linux-2.6.32.27/sound/drivers/portman2x4.c linux-2.6.32.27/sound/driv
};
diff -urNp linux-2.6.32.27/sound/oss/sb_audio.c linux-2.6.32.27/sound/oss/sb_audio.c
--- linux-2.6.32.27/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/oss/sb_audio.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/oss/sb_audio.c 2010-12-31 14:46:53.000000000 -0500
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
@@ -60458,9 +60293,67 @@ diff -urNp linux-2.6.32.27/sound/oss/sb_audio.c linux-2.6.32.27/sound/oss/sb_aud
if (copy_from_user(lbuf8,
userbuf+useroffs + p,
locallen))
+diff -urNp linux-2.6.32.27/sound/oss/soundcard.c linux-2.6.32.27/sound/oss/soundcard.c
+--- linux-2.6.32.27/sound/oss/soundcard.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/sound/oss/soundcard.c 2010-12-31 15:12:06.000000000 -0500
+@@ -87,7 +87,7 @@ int *load_mixer_volumes(char *name, int
+ int i, n;
+
+ for (i = 0; i < num_mixer_volumes; i++) {
+- if (strcmp(name, mixer_vols[i].name) == 0) {
++ if (strncmp(name, mixer_vols[i].name, 32) == 0) {
+ if (present)
+ mixer_vols[i].num = i;
+ return mixer_vols[i].levels;
+@@ -99,7 +99,7 @@ int *load_mixer_volumes(char *name, int
+ }
+ n = num_mixer_volumes++;
+
+- strcpy(mixer_vols[n].name, name);
++ strncpy(mixer_vols[n].name, name, 32);
+
+ if (present)
+ mixer_vols[n].num = n;
+diff -urNp linux-2.6.32.27/sound/oss/swarm_cs4297a.c linux-2.6.32.27/sound/oss/swarm_cs4297a.c
+--- linux-2.6.32.27/sound/oss/swarm_cs4297a.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.27/sound/oss/swarm_cs4297a.c 2010-12-31 14:47:01.000000000 -0500
+@@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void)
+ {
+ struct cs4297a_state *s;
+ u32 pwr, id;
+- mm_segment_t fs;
+ int rval;
+ #ifndef CONFIG_BCM_CS4297A_CSWARM
+ u64 cfg;
+@@ -2667,22 +2666,23 @@ static int __init cs4297a_init(void)
+ if (!rval) {
+ char *sb1250_duart_present;
+
++#if 0
++ mm_segment_t fs;
+ fs = get_fs();
+ set_fs(KERNEL_DS);
+-#if 0
+ val = SOUND_MASK_LINE;
+ mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
+ for (i = 0; i < ARRAY_SIZE(initvol); i++) {
+ val = initvol[i].vol;
+ mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
+ }
++ set_fs(fs);
+ // cs4297a_write_ac97(s, 0x18, 0x0808);
+ #else
+ // cs4297a_write_ac97(s, 0x5e, 0x180);
+ cs4297a_write_ac97(s, 0x02, 0x0808);
+ cs4297a_write_ac97(s, 0x18, 0x0808);
+ #endif
+- set_fs(fs);
+
+ list_add(&s->list, &cs4297a_devs);
+
diff -urNp linux-2.6.32.27/sound/pci/ac97/ac97_codec.c linux-2.6.32.27/sound/pci/ac97/ac97_codec.c
--- linux-2.6.32.27/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/pci/ac97/ac97_codec.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/pci/ac97/ac97_codec.c 2010-12-31 14:46:53.000000000 -0500
@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
}
@@ -60472,7 +60365,7 @@ diff -urNp linux-2.6.32.27/sound/pci/ac97/ac97_codec.c linux-2.6.32.27/sound/pci
static void do_update_power(struct work_struct *work)
diff -urNp linux-2.6.32.27/sound/pci/ac97/ac97_patch.c linux-2.6.32.27/sound/pci/ac97/ac97_patch.c
--- linux-2.6.32.27/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/pci/ac97/ac97_patch.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/pci/ac97/ac97_patch.c 2010-12-31 14:46:53.000000000 -0500
@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
return 0;
}
@@ -60781,7 +60674,7 @@ diff -urNp linux-2.6.32.27/sound/pci/ac97/ac97_patch.c linux-2.6.32.27/sound/pci
diff -urNp linux-2.6.32.27/sound/pci/ens1370.c linux-2.6.32.27/sound/pci/ens1370.c
--- linux-2.6.32.27/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/pci/ens1370.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/pci/ens1370.c 2010-12-31 14:46:53.000000000 -0500
@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
{ PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -60793,7 +60686,7 @@ diff -urNp linux-2.6.32.27/sound/pci/ens1370.c linux-2.6.32.27/sound/pci/ens1370
MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
diff -urNp linux-2.6.32.27/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.27/sound/pci/hda/patch_intelhdmi.c
--- linux-2.6.32.27/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/pci/hda/patch_intelhdmi.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/pci/hda/patch_intelhdmi.c 2010-12-31 14:46:53.000000000 -0500
@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
cp_ready);
@@ -60811,7 +60704,7 @@ diff -urNp linux-2.6.32.27/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.27/sound
diff -urNp linux-2.6.32.27/sound/pci/intel8x0.c linux-2.6.32.27/sound/pci/intel8x0.c
--- linux-2.6.32.27/sound/pci/intel8x0.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.27/sound/pci/intel8x0.c 2010-12-09 18:30:49.000000000 -0500
++++ linux-2.6.32.27/sound/pci/intel8x0.c 2010-12-31 14:46:53.000000000 -0500
@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -60832,7 +60725,7 @@ diff -urNp linux-2.6.32.27/sound/pci/intel8x0.c linux-2.6.32.27/sound/pci/intel8
static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
diff -urNp linux-2.6.32.27/sound/pci/intel8x0m.c linux-2.6.32.27/sound/pci/intel8x0m.c
--- linux-2.6.32.27/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/sound/pci/intel8x0m.c 2010-12-09 18:12:52.000000000 -0500
++++ linux-2.6.32.27/sound/pci/intel8x0m.c 2010-12-31 14:46:53.000000000 -0500
@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -60853,7 +60746,7 @@ diff -urNp linux-2.6.32.27/sound/pci/intel8x0m.c linux-2.6.32.27/sound/pci/intel
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
diff -urNp linux-2.6.32.27/usr/gen_init_cpio.c linux-2.6.32.27/usr/gen_init_cpio.c
--- linux-2.6.32.27/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/usr/gen_init_cpio.c 2010-12-09 18:12:55.000000000 -0500
++++ linux-2.6.32.27/usr/gen_init_cpio.c 2010-12-31 14:46:53.000000000 -0500
@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
@@ -60878,7 +60771,7 @@ diff -urNp linux-2.6.32.27/usr/gen_init_cpio.c linux-2.6.32.27/usr/gen_init_cpio
}
diff -urNp linux-2.6.32.27/virt/kvm/kvm_main.c linux-2.6.32.27/virt/kvm/kvm_main.c
--- linux-2.6.32.27/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.27/virt/kvm/kvm_main.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.27/virt/kvm/kvm_main.c 2010-12-31 14:46:53.000000000 -0500
@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
return 0;
}
diff --git a/2.6.32/4425_grsec-pax-without-grsec.patch b/2.6.32/4425_grsec-pax-without-grsec.patch
index 89fb166..7c55b40 100644
--- a/2.6.32/4425_grsec-pax-without-grsec.patch
+++ b/2.6.32/4425_grsec-pax-without-grsec.patch
@@ -13,7 +13,7 @@ The original version of this patch contained no credits/description.
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
-@@ -652,10 +652,12 @@
+@@ -658,10 +658,12 @@
#ifdef CONFIG_PAX_KERNEXEC
if (init_mm.start_code <= address && address < init_mm.end_code) {
diff --git a/2.6.32/4445_disable-compat_vdso.patch b/2.6.32/4445_disable-compat_vdso.patch
index 89e6884..338bc61 100644
--- a/2.6.32/4445_disable-compat_vdso.patch
+++ b/2.6.32/4445_disable-compat_vdso.patch
@@ -27,7 +27,7 @@ Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
--- a/arch/x86/Kconfig 2009-07-31 01:36:57.323857684 +0100
+++ b/arch/x86/Kconfig 2009-07-31 01:51:39.395749681 +0100
-@@ -1604,17 +1604,8 @@
+@@ -1605,17 +1605,8 @@
config COMPAT_VDSO
def_bool n