Merge branch 'sched/urgent' into sched/core · fac536f7e4 - Gogs

Merge branch 'sched/urgent' into sched/core

Merge reason: bring together all the pending scheduler bits,
              for the sched/numa changes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Ingo Molnar 13 years ago

parent

13e099d2f7 30b4e9eb78

commit

fac536f7e4

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
kernel/sched/core.c
							 
								View File
							
				@@ -6489,6 +6489,8 @@ static int __sdt_alloc(const struct cpumask *cpu_map)
			
				 			if (!sg)
			
				 				return -ENOMEM;
			
				+			sg->next = sg;
			
				+
			
				 			*per_cpu_ptr(sdd->sg, j) = sg;
			
				 			sgp = kzalloc_node(sizeof(struct sched_group_power),