Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / arch / um / drivers / random.c

diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index dd16c902ff701398c14e055bf71aa6e6a612dfff..57f03050c8505b00353a3902f014733de651db94 100644 (file)
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -12,7 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <irq_kern.h>
 #include <os.h>
 
@@ -76,7 +76,7 @@ static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
                        add_sigio_fd(random_fd);
 
                        add_wait_queue(&host_read_wait, &wait);
-                       set_task_state(current, TASK_INTERRUPTIBLE);
+                       set_current_state(TASK_INTERRUPTIBLE);
 
                        schedule();
                        remove_wait_queue(&host_read_wait, &wait);