Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9959faa8
Commit
9959faa8
authored
Oct 10, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://linux-input.bkbits.net/linux-input
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
d9d5add2
31989cba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
13 deletions
+9
-13
kernel/sched.c
kernel/sched.c
+9
-13
No files found.
kernel/sched.c
View file @
9959faa8
...
...
@@ -1953,7 +1953,6 @@ void set_cpus_allowed(task_t *p, unsigned long new_mask)
BUG();
#endif
preempt_disable
();
rq
=
task_rq_lock
(
p
,
&
flags
);
p
->
cpus_allowed
=
new_mask
;
/*
...
...
@@ -1962,7 +1961,7 @@ void set_cpus_allowed(task_t *p, unsigned long new_mask)
*/
if
(
new_mask
&
(
1UL
<<
task_cpu
(
p
)))
{
task_rq_unlock
(
rq
,
&
flags
);
goto
out
;
return
;
}
/*
* If the task is not on a runqueue (and not running), then
...
...
@@ -1971,17 +1970,16 @@ void set_cpus_allowed(task_t *p, unsigned long new_mask)
if
(
!
p
->
array
&&
!
task_running
(
rq
,
p
))
{
set_task_cpu
(
p
,
__ffs
(
p
->
cpus_allowed
));
task_rq_unlock
(
rq
,
&
flags
);
goto
out
;
return
;
}
init_completion
(
&
req
.
done
);
req
.
task
=
p
;
list_add
(
&
req
.
list
,
&
rq
->
migration_queue
);
task_rq_unlock
(
rq
,
&
flags
);
wake_up_process
(
rq
->
migration_thread
);
wait_for_completion
(
&
req
.
done
);
out:
preempt_enable
();
}
/*
...
...
@@ -1999,16 +1997,12 @@ static int migration_thread(void * data)
sigfillset
(
&
current
->
blocked
);
set_fs
(
KERNEL_DS
);
set_cpus_allowed
(
current
,
1UL
<<
cpu
);
/*
* Migration can happen without a migration thread on the
* target CPU because here we remove the thread from the
* runqueue and the helper thread then moves this thread
* to the target CPU - we'll wake up there.
* Either we are running on the right CPU, or there's a
* a migration thread on the target CPU, guaranteed.
*/
if
(
smp_processor_id
()
!=
cpu
)
printk
(
"migration_task %d on cpu=%d
\n
"
,
cpu
,
smp_processor_id
());
set_cpus_allowed
(
current
,
1UL
<<
cpu
);
ret
=
setscheduler
(
0
,
SCHED_FIFO
,
&
param
);
rq
=
this_rq
();
...
...
@@ -2055,6 +2049,8 @@ static int migration_thread(void * data)
if
(
p
->
array
)
{
deactivate_task
(
p
,
rq_src
);
activate_task
(
p
,
rq_dest
);
if
(
p
->
prio
<
rq_dest
->
curr
->
prio
)
resched_task
(
rq_dest
->
curr
);
}
}
double_rq_unlock
(
rq_src
,
rq_dest
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment