diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /arch/um/os-Linux/irq.c | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/um/os-Linux/irq.c')
| -rw-r--r-- | arch/um/os-Linux/irq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c index d46b818c131..d1b61d474e0 100644 --- a/arch/um/os-Linux/irq.c +++ b/arch/um/os-Linux/irq.c @@ -20,6 +20,10 @@ #include "os.h" #include "um_malloc.h" +/* + * Locked by irq_lock in arch/um/kernel/irq.c. Changed by os_create_pollfd + * and os_free_irq_by_cb, which are called under irq_lock. + */ static struct pollfd *pollfds = NULL; static int pollfds_num = 0; static int pollfds_size = 0; @@ -58,7 +62,7 @@ int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds) if (pollfds_num == pollfds_size) { if (size_tmpfds <= pollfds_size * sizeof(pollfds[0])) { /* return min size needed for new pollfds area */ - return((pollfds_size + 1) * sizeof(pollfds[0])); + return (pollfds_size + 1) * sizeof(pollfds[0]); } if (pollfds != NULL) { |