vserver 2.0 rc7

[linux-2.6.git] / arch / ppc64 / kernel / scanlog.c

diff --git a/arch/ppc64/kernel/scanlog.c b/arch/ppc64/kernel/scanlog.c
index b61d90e..4d70736 100644 (file)
--- a/arch/ppc64/kernel/scanlog.c
+++ b/arch/ppc64/kernel/scanlog.c
@@ -43,7 +43,7 @@ static int scanlog_debug;
 static unsigned int ibm_scan_log_dump;                 /* RTAS token */
 static struct proc_dir_entry *proc_ppc64_scan_log_dump;        /* The proc file */
 
-static ssize_t scanlog_read(struct file *file, char *buf,
+static ssize_t scanlog_read(struct file *file, char __user *buf,
                            size_t count, loff_t *ppos)
 {
         struct inode * inode = file->f_dentry->d_inode;
@@ -73,7 +73,7 @@ static ssize_t scanlog_read(struct file *file, char *buf,
                return -EINVAL;
        }
 
-       if (verify_area(VERIFY_WRITE, buf, count))
+       if (!access_ok(VERIFY_WRITE, buf, count))
                return -EFAULT;
 
        for (;;) {
@@ -129,7 +129,7 @@ static ssize_t scanlog_read(struct file *file, char *buf,
        /*NOTREACHED*/
 }
 
-static ssize_t scanlog_write(struct file * file, const char * buf,
+static ssize_t scanlog_write(struct file * file, const char __user * buf,
                             size_t count, loff_t *ppos)
 {
        char stkbuf[20];