diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /fs/select.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'fs/select.c')
| -rw-r--r-- | fs/select.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/select.c b/fs/select.c index d870237e42c7..8084834e123e 100644 --- a/fs/select.c +++ b/fs/select.c | |||
| @@ -110,6 +110,7 @@ void poll_initwait(struct poll_wqueues *pwq) | |||
| 110 | { | 110 | { |
| 111 | init_poll_funcptr(&pwq->pt, __pollwait); | 111 | init_poll_funcptr(&pwq->pt, __pollwait); |
| 112 | pwq->polling_task = current; | 112 | pwq->polling_task = current; |
| 113 | pwq->triggered = 0; | ||
| 113 | pwq->error = 0; | 114 | pwq->error = 0; |
| 114 | pwq->table = NULL; | 115 | pwq->table = NULL; |
| 115 | pwq->inline_index = 0; | 116 | pwq->inline_index = 0; |