Merge branch 'linux-2.6' into for-2.6.22

This commit is contained in:
Paul Mackerras
2007-04-30 12:38:01 +10:00
1949 changed files with 101563 additions and 76742 deletions

View File

@@ -1259,9 +1259,9 @@ static int smu_release(struct inode *inode, struct file *file)
set_current_state(TASK_UNINTERRUPTIBLE);
if (pp->cmd.status != 1)
break;
spin_lock_irqsave(&pp->lock, flags);
schedule();
spin_unlock_irqrestore(&pp->lock, flags);
schedule();
spin_lock_irqsave(&pp->lock, flags);
}
set_current_state(TASK_RUNNING);
remove_wait_queue(&pp->wait, &wait);