evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pm-sleep'

Browse source 
* pm-sleep:
  PM / Sleep: JBD and JBD2 missing set_freezable()
This commit is contained in:
Rafael J. Wysocki 2012-03-16 21:49:32 +01:00
commit cf3bbcaf09
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/jbd/journal.c
View file

@ -129,6 +129,8 @@ static int kjournald(void *arg)
setup_timer(&journal->j_commit_timer, commit_timeout, setup_timer(&journal->j_commit_timer, commit_timeout,
(unsigned long)current); (unsigned long)current);
set_freezable();
/* Record that the journal thread is running */ /* Record that the journal thread is running */
journal->j_task = current; journal->j_task = current;
wake_up(&journal->j_wait_done_commit); wake_up(&journal->j_wait_done_commit);

2
fs/jbd2/journal.c
View file

@ -139,6 +139,8 @@ static int kjournald2(void *arg)
setup_timer(&journal->j_commit_timer, commit_timeout, setup_timer(&journal->j_commit_timer, commit_timeout,
(unsigned long)current); (unsigned long)current);
set_freezable();
/* Record that the journal thread is running */ /* Record that the journal thread is running */
journal->j_task = current; journal->j_task = current;
wake_up(&journal->j_wait_done_commit); wake_up(&journal->j_wait_done_commit);