diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc64/kernel/rtas_flash.c | 12 | ||||
| -rw-r--r-- | arch/ppc64/kernel/scanlog.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/ppc64/kernel/rtas_flash.c b/arch/ppc64/kernel/rtas_flash.c index 3213837282ca..923e2e201a70 100644 --- a/arch/ppc64/kernel/rtas_flash.c +++ b/arch/ppc64/kernel/rtas_flash.c | |||
| @@ -218,7 +218,7 @@ static void get_flash_status_msg(int status, char *buf) | |||
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | /* Reading the proc file will show status (not the firmware contents) */ | 220 | /* Reading the proc file will show status (not the firmware contents) */ |
| 221 | static ssize_t rtas_flash_read(struct file *file, char *buf, | 221 | static ssize_t rtas_flash_read(struct file *file, char __user *buf, |
| 222 | size_t count, loff_t *ppos) | 222 | size_t count, loff_t *ppos) |
| 223 | { | 223 | { |
| 224 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 224 | 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, | |||
| 256 | * count is. If the system is low on memory it will be just as well | 256 | * count is. If the system is low on memory it will be just as well |
| 257 | * that we fail.... | 257 | * that we fail.... |
| 258 | */ | 258 | */ |
| 259 | static ssize_t rtas_flash_write(struct file *file, const char *buffer, | 259 | static ssize_t rtas_flash_write(struct file *file, const char __user *buffer, |
| 260 | size_t count, loff_t *off) | 260 | size_t count, loff_t *off) |
| 261 | { | 261 | { |
| 262 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 262 | 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) | |||
| 356 | args_buf->status = rc; | 356 | args_buf->status = rc; |
| 357 | } | 357 | } |
| 358 | 358 | ||
| 359 | static ssize_t manage_flash_read(struct file *file, char *buf, | 359 | static ssize_t manage_flash_read(struct file *file, char __user *buf, |
| 360 | size_t count, loff_t *ppos) | 360 | size_t count, loff_t *ppos) |
| 361 | { | 361 | { |
| 362 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 362 | 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, | |||
| 386 | return msglen; | 386 | return msglen; |
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | static ssize_t manage_flash_write(struct file *file, const char *buf, | 389 | static ssize_t manage_flash_write(struct file *file, const char __user *buf, |
| 390 | size_t count, loff_t *off) | 390 | size_t count, loff_t *off) |
| 391 | { | 391 | { |
| 392 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 392 | 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, | |||
| 466 | return n; | 466 | return n; |
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | static ssize_t validate_flash_read(struct file *file, char *buf, | 469 | static ssize_t validate_flash_read(struct file *file, char __user *buf, |
| 470 | size_t count, loff_t *ppos) | 470 | size_t count, loff_t *ppos) |
| 471 | { | 471 | { |
| 472 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 472 | 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, | |||
| 494 | return msglen; | 494 | return msglen; |
| 495 | } | 495 | } |
| 496 | 496 | ||
| 497 | static ssize_t validate_flash_write(struct file *file, const char *buf, | 497 | static ssize_t validate_flash_write(struct file *file, const char __user *buf, |
| 498 | size_t count, loff_t *off) | 498 | size_t count, loff_t *off) |
| 499 | { | 499 | { |
| 500 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 500 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); |
diff --git a/arch/ppc64/kernel/scanlog.c b/arch/ppc64/kernel/scanlog.c index 189b81a41987..4d70736619c7 100644 --- a/arch/ppc64/kernel/scanlog.c +++ b/arch/ppc64/kernel/scanlog.c | |||
| @@ -43,7 +43,7 @@ static int scanlog_debug; | |||
| 43 | static unsigned int ibm_scan_log_dump; /* RTAS token */ | 43 | static unsigned int ibm_scan_log_dump; /* RTAS token */ |
| 44 | static struct proc_dir_entry *proc_ppc64_scan_log_dump; /* The proc file */ | 44 | static struct proc_dir_entry *proc_ppc64_scan_log_dump; /* The proc file */ |
| 45 | 45 | ||
| 46 | static ssize_t scanlog_read(struct file *file, char *buf, | 46 | static ssize_t scanlog_read(struct file *file, char __user *buf, |
| 47 | size_t count, loff_t *ppos) | 47 | size_t count, loff_t *ppos) |
| 48 | { | 48 | { |
| 49 | struct inode * inode = file->f_dentry->d_inode; | 49 | struct inode * inode = file->f_dentry->d_inode; |
| @@ -129,7 +129,7 @@ static ssize_t scanlog_read(struct file *file, char *buf, | |||
| 129 | /*NOTREACHED*/ | 129 | /*NOTREACHED*/ |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | static ssize_t scanlog_write(struct file * file, const char * buf, | 132 | static ssize_t scanlog_write(struct file * file, const char __user * buf, |
| 133 | size_t count, loff_t *ppos) | 133 | size_t count, loff_t *ppos) |
| 134 | { | 134 | { |
| 135 | char stkbuf[20]; | 135 | char stkbuf[20]; |
