diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /kernel/wait.c | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'kernel/wait.c')
| -rw-r--r-- | kernel/wait.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index 59a82f63275d..444ddbfaefc4 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
| @@ -61,7 +61,7 @@ EXPORT_SYMBOL(remove_wait_queue); | |||
| 61 | * The spin_unlock() itself is semi-permeable and only protects | 61 | * The spin_unlock() itself is semi-permeable and only protects |
| 62 | * one way (it only protects stuff inside the critical region and | 62 | * one way (it only protects stuff inside the critical region and |
| 63 | * stops them from bleeding out - it would still allow subsequent | 63 | * stops them from bleeding out - it would still allow subsequent |
| 64 | * loads to move into the the critical region). | 64 | * loads to move into the critical region). |
| 65 | */ | 65 | */ |
| 66 | void fastcall | 66 | void fastcall |
| 67 | prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state) | 67 | prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state) |