SOURCES (LINUX_2_6): linux-2.6-cpuset_virtualization.patch - fix u...

baggins baggins at pld-linux.org
Sun Nov 27 00:43:32 CET 2005


Author: baggins                      Date: Sat Nov 26 23:43:32 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fix usage of pointers

---- Files affected:
SOURCES:
   linux-2.6-cpuset_virtualization.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-cpuset_virtualization.patch
diff -u SOURCES/linux-2.6-cpuset_virtualization.patch:1.1.2.2 SOURCES/linux-2.6-cpuset_virtualization.patch:1.1.2.3
--- SOURCES/linux-2.6-cpuset_virtualization.patch:1.1.2.2	Sun Nov 27 00:03:34 2005
+++ SOURCES/linux-2.6-cpuset_virtualization.patch	Sun Nov 27 00:43:27 2005
@@ -463,6 +463,14 @@
 diff -ur linux-2.6.14.3/kernel/sched.c linux-2.6.14.3-cpusetvirt/kernel/sched.c
 --- linux-2.6.14.3/kernel/sched.c	2005-11-24 23:10:21.000000000 +0100
 +++ linux-2.6.14.3-cpusetvirt/kernel/sched.c	2005-11-25 19:28:28.087979472 +0100
+@@ -3802,7 +3802,6 @@
+ {
+ 	task_t *p;
+ 	int retval;
+-	cpumask_t cpus_allowed;
+ 
+ 	lock_cpu_hotplug();
+ 	read_lock(&tasklist_lock);
 @@ -3827,9 +3827,11 @@
  			!capable(CAP_SYS_NICE))
  		goto out_unlock;
@@ -496,10 +504,10 @@
  	retval = 0;
 -	cpus_and(*mask, p->cpus_allowed, cpu_possible_map);
 +#ifdef CONFIG_CPUSETS
-+	if (cpuset_get_cpus_virt_affinity(p, &mask) < 0)
-+		cpus_and(mask, p->cpus_allowed, cpu_possible_map);
++	if (cpuset_get_cpus_virt_affinity(p, mask) < 0)
++		cpus_and(*mask, p->cpus_allowed, cpu_possible_map);
 +#else
-+  	cpus_and(mask, p->cpus_allowed, cpu_possible_map);
++  	cpus_and(*mask, p->cpus_allowed, cpu_possible_map);
 +#endif
  
  out_unlock:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-cpuset_virtualization.patch?r1=1.1.2.2&r2=1.1.2.3&f=u




More information about the pld-cvs-commit mailing list