[kernel] r13575 - in dists/lenny/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ian Campbell]

Author: ijc-guest
Date: Wed May  6 07:21:27 2009
New Revision: 13575

Log:
Add Xen variant of the arch-ia32-entry-int80-enosys patch and apply it to the
Xen images. Closes: #527101.

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/x86/arch-ia32-entry-int80-enosys-xen.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/16-extra

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Tue May  5 13:46:18 2009	(r13574)
+++ dists/lenny/linux-2.6/debian/changelog	Wed May  6 07:21:27 2009	(r13575)
@@ -27,6 +27,10 @@
   [ John Wright ]
   * [x86] gettimeofday() vDSO: fix segfault when tv == NULL (Closes: #466491)
 
+  [ Ian Campbell ]
+  * [x86/xen] Apply missing syscall detection patch to -xen-amd64 image
+    (Closes: #527101)
+
  -- maximilian attems <maks at debian.org>  Mon, 30 Mar 2009 17:11:49 +0200
 
 linux-2.6 (2.6.26-15) stable; urgency=high

Added: dists/lenny/linux-2.6/debian/patches/bugfix/x86/arch-ia32-entry-int80-enosys-xen.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/x86/arch-ia32-entry-int80-enosys-xen.patch	Wed May  6 07:21:27 2009	(r13575)
@@ -0,0 +1,23 @@
+diff --git a/arch/x86/ia32/ia32entry-xen.S b/arch/x86/ia32/ia32entry-xen.S
+index 256b00b..5a0d76d 100644
+--- a/arch/x86/ia32/ia32entry-xen.S
++++ b/arch/x86/ia32/ia32entry-xen.S
+@@ -418,5 +418,5 @@
+ 	jnz ia32_tracesys
+-ia32_do_syscall:	
+ 	cmpl $(IA32_NR_syscalls-1),%eax
+-	ja  int_ret_from_sys_call	/* ia32_tracesys has set RAX(%rsp) */
++	ja ia32_badsys
++ia32_do_call:
+ 	IA32_ARG_FIXUP
+@@ -435,7 +435,9 @@ ia32_tracesys:
+ 	call syscall_trace_enter
+ 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
+ 	RESTORE_REST
+-	jmp ia32_do_syscall
++	cmpl $(IA32_NR_syscalls-1),%eax
++	ja  int_ret_from_sys_call	/* ia32_tracesys has set RAX(%rsp) */
++	jmp ia32_do_call
+ END(ia32_syscall)
+ 
+ ia32_badsys:

Modified: dists/lenny/linux-2.6/debian/patches/series/16-extra
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/16-extra	Tue May  5 13:46:18 2009	(r13574)
+++ dists/lenny/linux-2.6/debian/patches/series/16-extra	Wed May  6 07:21:27 2009	(r13575)
@@ -5,3 +5,4 @@
 + features/all/openvz/0079-ptrace-ban-ptracing-of-a-container-init-from-inside.patch featureset=openvz
 + features/all/openvz/0081-ubc-uncharging-too-much-for-TCPSNDBUF.patch featureset=openvz
 + features/all/openvz/0082-ve-show-task-s-vpid-and-veid-even-inside-a-containe.patch featureset=openvz
++ bugfix/x86/arch-ia32-entry-int80-enosys-xen.patch featureset=xen