diff options
| author | Michael Young <m.a.young@durham.ac.uk> | 2010-10-23 14:31:30 +0100 |
|---|---|---|
| committer | Michael Young <m.a.young@durham.ac.uk> | 2010-10-23 14:37:48 +0100 |
| commit | 188105182eb7546e60971012d603e90b792e3cf8 (patch) | |
| tree | 37fe51c3b925e419a78c0f981dc806623477f762 /xen.pvops.pre.patch | |
| parent | 674c686daedf0934080c67664d9411082da3525a (diff) | |
| download | dom0-kernel-188105182eb7546e60971012d603e90b792e3cf8.tar.gz dom0-kernel-188105182eb7546e60971012d603e90b792e3cf8.tar.xz dom0-kernel-188105182eb7546e60971012d603e90b792e3cf8.zip | |
update pvops to get CVE-2010-3904 fix
Diffstat (limited to 'xen.pvops.pre.patch')
| -rw-r--r-- | xen.pvops.pre.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/xen.pvops.pre.patch b/xen.pvops.pre.patch index a978beb..7c3dd42 100644 --- a/xen.pvops.pre.patch +++ b/xen.pvops.pre.patch @@ -3,6 +3,7 @@ Affected patches; linux-2.6-defaults-pci_no_msi.patch - drivers/pci/pci.h linux-2.6-pci-cacheline-sizing.patch - arch/x86/pci/common.c linux-2.6-execshield.patch - arch/x86/include/asm/mmu.h +patch-2.6.32.25-rc1.bz2 - arch/x86/kernel/Makefile --- a/drivers/pci/pci.h 2009-04-24 20:46:50.000000000 +0100 +++ b/drivers/pci/pci.h 2009-04-23 20:13:43.000000000 +0100 @@ -67,3 +68,16 @@ index 2202b62..f371fe8 100644 } mm_context_t; #ifdef CONFIG_SMP +diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile +index d8e5d0c..d1911ab 100644 +--- a/arch/x86/kernel/Makefile ++++ b/arch/x86/kernel/Makefile +@@ -11,8 +11,6 @@ ifdef CONFIG_FUNCTION_TRACER + CFLAGS_REMOVE_tsc.o = -pg + CFLAGS_REMOVE_rtc.o = -pg + CFLAGS_REMOVE_paravirt-spinlocks.o = -pg +-CFLAGS_REMOVE_pvclock.o = -pg +-CFLAGS_REMOVE_kvmclock.o = -pg + CFLAGS_REMOVE_ftrace.o = -pg + CFLAGS_REMOVE_early_printk.o = -pg + endif |