[kernel] r12552 - in people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update: features/all/xen series

[Bastian Blank]

Author: waldi
Date: Fri Jan  9 11:09:45 2009
New Revision: 12552

Log:
* debian/patches-update/features/all/xen/vdso-use_install_special_mapping.patch: Add.
* debian/patches-update/features/all/xen/xen-748f324a4b2d62d89fe40c4aa52861977e1a2cae.patch
  Fix.
* debian/patches-update/series/23etch1-extra: Add new patch.


Added:
   people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/vdso-use_install_special_mapping.patch   (contents, props changed)
      - copied, changed from r12550, /dists/etch-security/linux-2.6/debian/patches/features/all/xen/vdso-use_install_special_mapping.patch
   people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/series/23etch1-extra
Modified:
   people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/xen-748f324a4b2d62d89fe40c4aa52861977e1a2cae.patch

Copied: people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/vdso-use_install_special_mapping.patch (from r12550, /dists/etch-security/linux-2.6/debian/patches/features/all/xen/vdso-use_install_special_mapping.patch)
==============================================================================
--- /dists/etch-security/linux-2.6/debian/patches/features/all/xen/vdso-use_install_special_mapping.patch	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/vdso-use_install_special_mapping.patch	Fri Jan  9 11:09:45 2009
@@ -1,16 +1,19 @@
 diff -urpN linux-source-2.6.18.orig/arch/x86_64/ia32/syscall32-xen.c linux-source-2.6.18/arch/x86_64/ia32/syscall32-xen.c
 --- linux-source-2.6.18.orig/arch/x86_64/ia32/syscall32-xen.c	2008-11-04 01:32:02.000000000 -0700
 +++ linux-source-2.6.18/arch/x86_64/ia32/syscall32-xen.c	2008-11-04 01:47:52.000000000 -0700
-@@ -21,68 +21,35 @@ extern unsigned char syscall32_syscall[]
+@@ -21,71 +21,38 @@ extern unsigned char syscall32_syscall[]
  extern unsigned char syscall32_sysenter[], syscall32_sysenter_end[];
  extern int sysctl_vsyscall32;
  
 -char *syscall32_page; 
 +static struct page *syscall32_pages[1];
- #ifndef USE_INT80
  static int use_sysenter = -1;
- #endif
  
+ #if CONFIG_XEN_COMPAT < 0x030200
+ extern unsigned char syscall32_int80[], syscall32_int80_end[];
+ static int use_int80 = 1;
+ #endif
+
 -static struct page *
 -syscall32_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
 -{

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/xen-748f324a4b2d62d89fe40c4aa52861977e1a2cae.patch
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/xen-748f324a4b2d62d89fe40c4aa52861977e1a2cae.patch	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/xen-748f324a4b2d62d89fe40c4aa52861977e1a2cae.patch	Fri Jan  9 11:09:45 2009
@@ -14610,20 +14610,6 @@
  #endif
  
  	if (!boot_cpu_has(X86_FEATURE_SEP)) {
-@@ -142,6 +171,13 @@
- 	vma->vm_end = addr + PAGE_SIZE;
- 	/* MAYWRITE to allow gdb to COW and set breakpoints */
- 	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
-+	/*
-+	 * Make sure the vDSO gets into every core dump.
-+	 * Dumping its contents makes post-mortem fully interpretable later
-+	 * without matching up the same kernel and hardware config to see
-+	 * what PC values meant.
-+	 */
-+	vma->vm_flags |= VM_ALWAYSDUMP;
- 	vma->vm_flags |= mm->def_flags;
- 	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
- 	vma->vm_ops = &syscall_vm_ops;
 diff -r d894e36cfc30 -r 0aa021803deb arch/i386/kernel/time-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/arch/i386/kernel/time-xen.c	Wed Sep 10 10:54:08 2008 +0100
@@ -41077,23 +41063,6 @@
 +	if (use_sysenter < 0)
 +		use_sysenter = (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL);
 +}
-diff -r d894e36cfc30 -r 0aa021803deb arch/x86_64/ia32/syscall32.c
---- a/arch/x86_64/ia32/syscall32.c	Tue Sep 09 11:37:38 2008 +0200
-+++ b/arch/x86_64/ia32/syscall32.c	Wed Sep 10 10:54:08 2008 +0100
-@@ -59,6 +59,13 @@
- 	vma->vm_end = VSYSCALL32_END;
- 	/* MAYWRITE to allow gdb to COW and set breakpoints */
- 	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
-+	/*
-+	 * Make sure the vDSO gets into every core dump.
-+	 * Dumping its contents makes post-mortem fully interpretable later
-+	 * without matching up the same kernel and hardware config to see
-+	 * what PC values meant.
-+	 */
-+	vma->vm_flags |= VM_ALWAYSDUMP;
- 	vma->vm_flags |= mm->def_flags;
- 	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
- 	vma->vm_ops = &syscall32_vm_ops;
 diff -r d894e36cfc30 -r 0aa021803deb arch/x86_64/ia32/syscall32_syscall-xen.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/arch/x86_64/ia32/syscall32_syscall-xen.S	Wed Sep 10 10:54:08 2008 +0100

Added: people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/series/23etch1-extra
==============================================================================
--- (empty file)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/series/23etch1-extra	Fri Jan  9 11:09:45 2009
@@ -0,0 +1 @@
++ features/all/xen/vdso-use_install_special_mapping.patch