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
nexedi
linux
Commits
d4c64640
Commit
d4c64640
authored
May 21, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge home.transmeta.com:/home/torvalds/v2.5/preemption
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
ffab9e04
eb245678
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
mm/pdflush.c
mm/pdflush.c
+0
-10
No files found.
mm/pdflush.c
View file @
d4c64640
...
...
@@ -79,12 +79,6 @@ struct pdflush_work {
unsigned
long
when_i_went_to_sleep
;
};
/*
* preemption is disabled in pdflush. There was a bug in preempt
* which was causing pdflush to get flipped into state TASK_RUNNING
* when it performed a spin_unlock. That bug is probably fixed,
* but play it safe. The preempt-off paths are very short.
*/
static
int
__pdflush
(
struct
pdflush_work
*
my_work
)
{
daemonize
();
...
...
@@ -101,7 +95,6 @@ static int __pdflush(struct pdflush_work *my_work)
my_work
->
fn
=
NULL
;
my_work
->
who
=
current
;
preempt_disable
();
spin_lock_irq
(
&
pdflush_lock
);
nr_pdflush_threads
++
;
// printk("pdflush %d [%d] starts\n", nr_pdflush_threads, current->pid);
...
...
@@ -120,10 +113,8 @@ static int __pdflush(struct pdflush_work *my_work)
#endif
schedule
();
preempt_enable
();
if
(
my_work
->
fn
)
(
*
my_work
->
fn
)(
my_work
->
arg0
);
preempt_disable
();
/*
* Thread creation: For how long have there been zero
...
...
@@ -158,7 +149,6 @@ static int __pdflush(struct pdflush_work *my_work)
nr_pdflush_threads
--
;
// printk("pdflush %d [%d] ends\n", nr_pdflush_threads, current->pid);
spin_unlock_irq
(
&
pdflush_lock
);
preempt_enable
();
return
0
;
}
...
...
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