summaryrefslogtreecommitdiff
path: root/kernel/fork.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2002-07-21 23:44:38 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-07-21 23:44:38 -0700
commitf1594c9c1ae6a3e94f2c1de398bca093ee62aab2 (patch)
tree9eb4def718cb7b51128c537009ba96b192807960 /kernel/fork.c
parent7ee2f6c993a829cc24cce819261bc2b6053348cc (diff)
[PATCH] Re: [patch] cli()/sti() cleanup
Make people use the proper cli/sti replacements
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index f99f9e69521a..99ac5e5799d3 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -740,8 +740,8 @@ struct task_struct *do_fork(unsigned long clone_flags,
* total amount of pending timeslices in the system doesnt change,
* resulting in more scheduling fairness.
*/
- __save_flags(flags);
- __cli();
+ local_save_flags(flags);
+ local_irq_disable();
p->time_slice = (current->time_slice + 1) >> 1;
current->time_slice >>= 1;
if (!current->time_slice) {
@@ -754,7 +754,7 @@ struct task_struct *do_fork(unsigned long clone_flags,
scheduler_tick(0, 0);
}
p->sleep_timestamp = jiffies;
- __restore_flags(flags);
+ local_irq_restore(flags);
/*
* Ok, add it to the run-queues and make it