[kernel] r12123 - dists/sid/linux-2.6/debian/patches/features/all/vserver

[Bastian Blank]

Author: waldi
Date: Thu Aug 21 11:57:29 2008
New Revision: 12123

Log:
debian/patches/features/all/vserver/vs2.3.0.35.patch: Fix.


Modified:
   dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch	Thu Aug 21 11:57:29 2008
@@ -15863,19 +15863,19 @@
  
  /*
   * Management arrays for POSIX timers.	 Timers are kept in slab memory
-@@ -298,6 +299,12 @@ void do_schedule_next_timer(struct sigin
- 
- int posix_timer_event(struct k_itimer *timr,int si_private)
- {
+@@ -298,6 +299,12 @@ int posix_timer_event(struct k_itimer *timr, int si_private)
+ 	 * and re-schedules it while ->sigq is pending.
+ 	 * Not really bad, but not that we want.
+ 	 */
 +	struct vx_info_save vxis;
 +	struct vx_info *vxi;
 +	int ret;
 +
 +	vxi = task_get_vx_info(timr->it_process);
 +	enter_vx_info(vxi, &vxis);
- 	memset(&timr->sigq->info, 0, sizeof(siginfo_t));
  	timr->sigq->info.si_sys_private = si_private;
- 	/* Send signal to the process that owns this timer.*/
+ 
+ 	timr->sigq->info.si_signo = timr->it_sigev_signo;
 @@ -310,10 +317,11 @@ int posix_timer_event(struct k_itimer *t
  
  	if (timr->it_sigev_notify & SIGEV_THREAD_ID) {
@@ -25823,8 +25823,8 @@
 -	mm->locked_vm -= pages;
 +	vx_vmlocked_sub(mm, pages);
  out:
- 	if (ret == -ENOMEM)
- 		ret = -EAGAIN;
+ 	return ret;
+ }
 @@ -134,7 +135,7 @@ static int do_mlock(unsigned long start,
  
  asmlinkage long sys_mlock(unsigned long start, size_t len)