[kernel] r12130 - dists/sid/linux-2.6/debian/patches/features/all/openvz

[Bastian Blank]

Author: waldi
Date: Thu Aug 21 19:47:14 2008
New Revision: 12130

Log:
debian/patches/features/all/openvz/openvz.patch: Fix.


Modified:
   dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Thu Aug 21 19:47:14 2008
@@ -60737,10 +60737,10 @@
  	idr_init(&posix_timers_id);
  	return 0;
  }
-@@ -298,6 +303,13 @@ void do_schedule_next_timer(struct siginfo *info)
- 
- int posix_timer_event(struct k_itimer *timr,int si_private)
- {
+@@ -298,6 +303,13 @@ 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.
+ 	 */
 +	int ret;
 +	struct ve_struct *ve;
 +	struct user_beancounter *ub;
@@ -60748,9 +60748,9 @@
 +	ve = set_exec_env(timr->it_process->ve_task_info.owner_env);
 +	ub = set_exec_ub(timr->it_process->task_bc.task_ub);
 +
- 	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 +322,10 @@ int posix_timer_event(struct k_itimer *timr,int si_private)
  
  	if (timr->it_sigev_notify & SIGEV_THREAD_ID) {
@@ -67360,7 +67360,7 @@
  	}
  
  success:
-@@ -74,13 +84,19 @@ success:
+@@ -74,11 +84,17 @@ success:
  		pages = -pages;
  		if (!(newflags & VM_IO))
  			ret = make_pages_present(start, end);
@@ -67370,8 +67370,6 @@
  
  	mm->locked_vm -= pages;
  out:
- 	if (ret == -ENOMEM)
- 		ret = -EAGAIN;
  	return ret;
 +
 +out_uncharge: