Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efa54579 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] ppc64: trivial user annotations 



Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5330e927

arch/ppc64/kernel/rtas_flash.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -218,7 +218,7 @@ static void get_flash_status_msg(int status, char *buf) 
}

}





/* Reading the proc file will show status (not the firmware contents) */

/* Reading the proc file will show status (not the firmware contents) */

static ssize_t rtas_flash_read(struct file *file, char *buf,

static ssize_t rtas_flash_read(struct file *file, char __user *buf,

			       size_t count, loff_t *ppos)

			       size_t count, loff_t *ppos)

{

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
@@ -256,7 +256,7 @@ static ssize_t rtas_flash_read(struct file *file, char *buf, 
 * count is.  If the system is low on memory it will be just as well

 * count is.  If the system is low on memory it will be just as well

 * that we fail....

 * that we fail....

 */

 */

static ssize_t rtas_flash_write(struct file *file, const char *buffer,

static ssize_t rtas_flash_write(struct file *file, const char __user *buffer,

				size_t count, loff_t *off)

				size_t count, loff_t *off)

{

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
@@ -356,7 +356,7 @@ static void manage_flash(struct rtas_manage_flash_t *args_buf) 
	args_buf->status = rc;

	args_buf->status = rc;

}

}





static ssize_t manage_flash_read(struct file *file, char *buf,

static ssize_t manage_flash_read(struct file *file, char __user *buf,

			       size_t count, loff_t *ppos)

			       size_t count, loff_t *ppos)

{

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
@@ -386,7 +386,7 @@ static ssize_t manage_flash_read(struct file *file, char *buf, 
	return msglen;

	return msglen;

}

}





static ssize_t manage_flash_write(struct file *file, const char *buf,

static ssize_t manage_flash_write(struct file *file, const char __user *buf,

				size_t count, loff_t *off)

				size_t count, loff_t *off)

{

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
@@ -466,7 +466,7 @@ static int get_validate_flash_msg(struct rtas_validate_flash_t *args_buf, 
	return n;

	return n;

}

}





static ssize_t validate_flash_read(struct file *file, char *buf,

static ssize_t validate_flash_read(struct file *file, char __user *buf,

			       size_t count, loff_t *ppos)

			       size_t count, loff_t *ppos)

{

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
@@ -494,7 +494,7 @@ static ssize_t validate_flash_read(struct file *file, char *buf, 
	return msglen;

	return msglen;

}

}





static ssize_t validate_flash_write(struct file *file, const char *buf,

static ssize_t validate_flash_write(struct file *file, const char __user *buf,

				    size_t count, loff_t *off)

				    size_t count, loff_t *off)

{

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

arch/ppc64/kernel/scanlog.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ static int scanlog_debug; 
static unsigned int ibm_scan_log_dump;			/* RTAS token */

static unsigned int ibm_scan_log_dump;			/* RTAS token */

static struct proc_dir_entry *proc_ppc64_scan_log_dump;	/* The proc file */

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)

			    size_t count, loff_t *ppos)

{

{

        struct inode * inode = file->f_dentry->d_inode;

        struct inode * inode = file->f_dentry->d_inode;
@@ -129,7 +129,7 @@ static ssize_t scanlog_read(struct file *file, char *buf, 
	/*NOTREACHED*/

	/*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)

			     size_t count, loff_t *ppos)

{

{

	char stkbuf[20];

	char stkbuf[20];