Pull now into release branch

[pandora-kernel.git] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index d862241..46dca31 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -26,8 +26,6 @@
 
 #include <asm/uaccess.h>
 
-#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-
 struct poll_table_page {
        struct poll_table_page * next;
        struct poll_table_entry * entry;
@@ -64,7 +62,7 @@ EXPORT_SYMBOL(poll_initwait);
 
 static void free_poll_entry(struct poll_table_entry *entry)
 {
-       remove_wait_queue(entry->wait_address,&entry->wait);
+       remove_wait_queue(entry->wait_address, &entry->wait);
        fput(entry->filp);
 }
 
@@ -128,7 +126,7 @@ static void __pollwait(struct file *filp, wait_queue_head_t *wait_address,
        entry->filp = filp;
        entry->wait_address = wait_address;
        init_waitqueue_entry(&entry->wait, current);
-       add_wait_queue(wait_address,&entry->wait);
+       add_wait_queue(wait_address, &entry->wait);
 }
 
 #define FDS_IN(fds, n)         (fds->in + n)