X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc64%2Fkernel%2Fscanlog.c;h=b61d90edd84c6666af35903d6cbc03cf933b4f05;hb=f1227cd3e0e73c48b93368800aa89f4341103a00;hp=4d70736619c7d5153c8d54bc10e12eb078cb686a;hpb=340e2b1a4c74f653454348914c408420d5d3c28a;p=linux-2.6.git diff --git a/arch/ppc64/kernel/scanlog.c b/arch/ppc64/kernel/scanlog.c index 4d7073661..b61d90edd 100644 --- 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 __user *buf, +static ssize_t scanlog_read(struct file *file, char *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 __user *buf, return -EINVAL; } - if (!access_ok(VERIFY_WRITE, buf, count)) + if (verify_area(VERIFY_WRITE, buf, count)) return -EFAULT; for (;;) { @@ -129,7 +129,7 @@ static ssize_t scanlog_read(struct file *file, char __user *buf, /*NOTREACHED*/ } -static ssize_t scanlog_write(struct file * file, const char __user * buf, +static ssize_t scanlog_write(struct file * file, const char * buf, size_t count, loff_t *ppos) { char stkbuf[20];